diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-07-08 17:29:48 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-07-08 17:29:48 -0400 |
| commit | 29bea5a6b94458e23559bdbeaae5a593100533b6 (patch) | |
| tree | 5bd356450afd8da159542bfd444b653442004a45 /indra/cmake/Boost.cmake | |
| parent | 053f436413c01e237accabace4dc5ff1eccca837 (diff) | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
Merge. Refresh from viewer-release after 3.7.11 release.
Diffstat (limited to 'indra/cmake/Boost.cmake')
| -rwxr-xr-x | indra/cmake/Boost.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 348521a77c..25e54b7cbd 100755 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -4,7 +4,7 @@ include(Prebuilt) set(Boost_FIND_QUIETLY ON) set(Boost_FIND_REQUIRED ON) -if (STANDALONE) +if (USESYSTEMLIBS) include(FindBoost) set(BOOST_CONTEXT_LIBRARY boost_context-mt) @@ -15,7 +15,7 @@ if (STANDALONE) set(BOOST_SIGNALS_LIBRARY boost_signals-mt) set(BOOST_SYSTEM_LIBRARY boost_system-mt) set(BOOST_THREAD_LIBRARY boost_thread-mt) -else (STANDALONE) +else (USESYSTEMLIBS) use_prebuilt_binary(boost) set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) set(BOOST_VERSION "1.55") @@ -122,4 +122,4 @@ else (STANDALONE) optimized boost_thread-mt debug boost_thread-mt-d) endif (WINDOWS) -endif (STANDALONE) +endif (USESYSTEMLIBS) |