diff options
author | Simon Linden <simon@lindenlab.com> | 2014-07-18 22:28:33 +0000 |
---|---|---|
committer | Simon Linden <simon@lindenlab.com> | 2014-07-18 22:28:33 +0000 |
commit | 7714c7679da7c6c28c3f3f09af6b586a680dc26c (patch) | |
tree | f14c766b090f50cbb866123305f676e831ef483b /indra/cmake/APR.cmake | |
parent | 1655887f30e40ea390b6dca9f64ac5e84309be05 (diff) | |
parent | ff3827f278d2d53f565bc585edc4db5bc5e5dc38 (diff) |
Merge in downstream viewer-tiger
Diffstat (limited to 'indra/cmake/APR.cmake')
-rwxr-xr-x | indra/cmake/APR.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index a87027f5f6..1a01671002 100755 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -8,9 +8,9 @@ set(APR_FIND_REQUIRED ON) set(APRUTIL_FIND_QUIETLY ON) set(APRUTIL_FIND_REQUIRED ON) -if (STANDALONE) +if (USESYSTEMLIBS) include(FindAPR) -else (STANDALONE) +else (USESYSTEMLIBS) use_prebuilt_binary(apr_suite) if (WINDOWS) if (LLCOMMON_LINK_SHARED) @@ -52,4 +52,4 @@ else (STANDALONE) list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid) list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} rt) endif (LINUX) -endif (STANDALONE) +endif (USESYSTEMLIBS) |