diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2008-07-31 20:53:33 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2008-07-31 20:53:33 +0000 |
| commit | b82b614d3c208301a71c4c2befb36d132e245a30 (patch) | |
| tree | e78fff027b0def92699acae509f869c09864ed00 | |
| parent | 7c2d8fc8f891bf261c3f61c18b4b8587a5ab2743 (diff) | |
DEV-18513: Simplify use of Boost libraries on OS X.
Self-reviewed.
| -rw-r--r-- | indra/cmake/Boost.cmake | 15 | ||||
| -rw-r--r-- | indra/cmake/Linking.cmake | 2 |
2 files changed, 4 insertions, 13 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index c7df87177e..a7db67c915 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -38,18 +38,9 @@ else (STANDALONE) debug libboost_signals-vc80-mt-sgd-${BOOST_VERSION}) endif (MSVC71) elseif (DARWIN) - set(BOOST_PROGRAM_OPTIONS_LIBRARY - optimized boost_program_options-mt - debug boost_program_options-mt-d - ) - set(BOOST_REGEX_LIBRARY - optimized boost_regex-mt - debug boost_regex-mt-d - ) - set(BOOST_SIGNALS_LIBRARY - optimized boost_signals-mt - debug boost_signals-mt-d - ) + set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) + set(BOOST_REGEX_LIBRARY boost_regex-mt) + set(BOOST_SIGNALS_LIBRARY boost_signals-mt) elseif (LINUX) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) set(BOOST_REGEX_LIBRARY boost_regex-mt) diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index 3146016b9a..634a8074bf 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -14,7 +14,7 @@ if (NOT STANDALONE) endif (VIEWER) elseif (DARWIN) set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release) - set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_debug) + set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS_RELEASE}) endif (WINDOWS) endif (NOT STANDALONE) |