diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-08 09:24:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-08 09:24:07 -0400 |
| commit | 444311d58082ae1277a3628fbe380f7407910f50 (patch) | |
| tree | 9349d5caf656ac427da037fe6fc4b1f4f387ded1 /indra/cmake/APR.cmake | |
| parent | a22e3df7e5570e52abcba4a28103c3d76960a010 (diff) | |
| parent | c492bffaa6cd0d9bb05bbc3671c7658b7ba52862 (diff) | |
pull tags and late fixes back from viewer-pre-release
Diffstat (limited to 'indra/cmake/APR.cmake')
| -rw-r--r-- | indra/cmake/APR.cmake | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index 180504d286..daafa00fe2 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -32,27 +32,21 @@ else (STANDALONE) ) elseif (DARWIN) if (LLCOMMON_LINK_SHARED) - set(APR_selector "0.3.7.dylib") - set(APRUTIL_selector "0.3.8.dylib") + set(APR_selector "0.dylib") + set(APRUTIL_selector "0.dylib") else (LLCOMMON_LINK_SHARED) set(APR_selector "a") set(APRUTIL_selector "a") endif (LLCOMMON_LINK_SHARED) - set(APR_LIBRARIES - debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.${APR_selector} - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.${APR_selector} - ) - set(APRUTIL_LIBRARIES - debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.${APRUTIL_selector} - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.${APRUTIL_selector} - ) + set(APR_LIBRARIES libapr-1.${APR_selector}) + set(APRUTIL_LIBRARIES libaprutil-1.${APRUTIL_selector}) 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) + set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/apr-1) if (LINUX) if (VIEWER) |