diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index 8fe4144a28f852d88cc3388a23b3b6dd8f94b422..94de0bec6d30edc25c55c8452ef1c9fb6c933277 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -25,7 +25,7 @@ else (USESYSTEMLIBS) debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}aprutil-1.lib ${APRICONV_LIBRARIES} optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib ${APRICONV_LIBRARIES} ) - else() + elseif(DARWIN) set(APR_LIBRARIES debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.a @@ -35,6 +35,15 @@ else (USESYSTEMLIBS) debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.a ${APRICONV_LIBRARIES} optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a ${APRICONV_LIBRARIES} ) + else() + set(APR_LIBRARIES + debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.a + ) + set(APRUTIL_LIBRARIES + debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.a + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a + ) endif () set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/apr-1)