diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-16 18:18:34 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-16 18:18:34 -0500 |
| commit | bf7801aeec041fd162599b1b394780ef0e32fe9c (patch) | |
| tree | a752303db33c4c55609aa37379fafe36d50d6360 /indra/cmake/APR.cmake | |
| parent | eacd9d5d590069b56ae3497a3830c5e299475a4a (diff) | |
| parent | 4d040e3c5d6eb1f105bf837191e06866ba4bef5b (diff) | |
merging in latest viewer-development
Diffstat (limited to 'indra/cmake/APR.cmake')
| -rw-r--r-- | indra/cmake/APR.cmake | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index 180504d286..5b31b0d237 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -38,21 +38,15 @@ else (STANDALONE) 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) |