diff options
| author | Nicky <nicky.dasmijn@gmail.com> | 2022-04-13 10:28:46 +0200 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@gmail.com> | 2022-04-13 10:28:46 +0200 |
| commit | d3521b4462195cfe882b2cc8eb4e7c5e948c0fb6 (patch) | |
| tree | eee8a16ba63a63f966d725b5b5fe2bf234b25da3 /indra/cmake/APR.cmake | |
| parent | 07d388f416b64ad5ea6a79d7dee4bf9e6bab7b74 (diff) | |
Remove obsolete and unmaintained USE_SYSTEMLIBS
Diffstat (limited to 'indra/cmake/APR.cmake')
| -rw-r--r-- | indra/cmake/APR.cmake | 74 |
1 files changed, 35 insertions, 39 deletions
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index 5a7c504af8..63ea195fad 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -7,43 +7,39 @@ endif() create_target( apr::apr) -if (USESYSTEMLIBS) - include(FindAPR) -else (USESYSTEMLIBS) - use_prebuilt_binary(apr_suite) - if (WINDOWS) - if (LLCOMMON_LINK_SHARED) - set(APR_selector "lib") - else (LLCOMMON_LINK_SHARED) - set(APR_selector "") - endif (LLCOMMON_LINK_SHARED) - set_target_libraries( apr::apr - ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apr-1.lib - ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apriconv-1.lib - ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib - ) - elseif (DARWIN) - if (LLCOMMON_LINK_SHARED) - 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) +use_prebuilt_binary(apr_suite) +if (WINDOWS) + if (LLCOMMON_LINK_SHARED) + set(APR_selector "lib") + else (LLCOMMON_LINK_SHARED) + set(APR_selector "") + endif (LLCOMMON_LINK_SHARED) + set_target_libraries( apr::apr + ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apr-1.lib + ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apriconv-1.lib + ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib + ) +elseif (DARWIN) + if (LLCOMMON_LINK_SHARED) + 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_target_libraries( apr::apr - libapr-1.${APR_selector} - libaprutil-1.${APRUTIL_selector} - iconv - ) - else (WINDOWS) - set_target_libraries( apr::apr - apr-1 - aprutil-1 - iconv - uuid - rt - ) - endif (WINDOWS) - set_target_include_dirs( apr::apr ${LIBS_PREBUILT_DIR}/include/apr-1 ) -endif (USESYSTEMLIBS) + set_target_libraries( apr::apr + libapr-1.${APR_selector} + libaprutil-1.${APRUTIL_selector} + iconv + ) +else (WINDOWS) + set_target_libraries( apr::apr + apr-1 + aprutil-1 + iconv + uuid + rt + ) +endif (WINDOWS) +set_target_include_dirs( apr::apr ${LIBS_PREBUILT_DIR}/include/apr-1 ) |