diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2008-09-02 20:54:30 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2008-09-02 20:54:30 +0000 |
| commit | fa11307d6106ca0b889c31d2c7707303bb142113 (patch) | |
| tree | 1b14b876dca96dee5b3e463760bb8a8311b07803 | |
| parent | 4cccb812de6921e9e89d2805fdd7b219e58df453 (diff) | |
QAR-842 / Port Mac build borkage fix to release
| -rw-r--r-- | indra/cmake/APR.cmake | 3 | ||||
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index 2a96d70173..fe3ca941ee 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -42,10 +42,11 @@ else (STANDALONE) debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.a optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a ) - set(APRICONV_LIBRARIES apriconv-1) + set(APRICONV_LIBRARIES iconv) else (WINDOWS) set(APR_LIBRARIES apr-1) set(APRUTIL_LIBRARIES aprutil-1) + set(APRICONV_LIBRARIES iconv) endif (WINDOWS) set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1) diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 4001e1f0c5..6ef7b82ebb 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -190,6 +190,7 @@ add_library (llcommon ${llcommon_SOURCE_FILES}) target_link_libraries( llcommon ${APRUTIL_LIBRARIES} + ${APRICONV_LIBRARIES} ${APR_LIBRARIES} ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES} |