diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-14 22:52:11 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-14 22:52:11 -0700 |
| commit | 35b61cdd44a9195a5174a8bd22e96e6b404f42bc (patch) | |
| tree | 8fa3c0e0e055d2995b86c212105ed5910392c320 /indra/cmake/Boost.cmake | |
| parent | ab27883b7ec6e3affde28ab061654adb264526c7 (diff) | |
| parent | 72d1febadb5f254eb7199bd26eb04a7553a6e55d (diff) | |
Pull from jenn_linden/viewer-vs2010
Diffstat (limited to 'indra/cmake/Boost.cmake')
| -rw-r--r-- | indra/cmake/Boost.cmake | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index b9c047a764..2135f0584c 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -49,17 +49,10 @@ else (STANDALONE) optimized libboost_filesystem-vc100-mt-${BOOST_VERSION} debug libboost_filesystem-vc100-mt-gd-${BOOST_VERSION}) endif (MSVC80) - elseif (DARWIN) - set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt) - set(BOOST_REGEX_LIBRARY boost_regex-xgcc40-mt) - set(BOOST_SIGNALS_LIBRARY boost_signals-xgcc40-mt) - set(BOOST_SYSTEM_LIBRARY boost_system-xgcc40-mt) - set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-xgcc40-mt) - elseif (LINUX) - set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-gcc41-mt) - set(BOOST_REGEX_LIBRARY boost_regex-gcc41-mt) - set(BOOST_SIGNALS_LIBRARY boost_signals-gcc41-mt) - set(BOOST_SYSTEM_LIBRARY boost_system-gcc41-mt) - set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-gcc41-mt) + elseif (DARWIN OR LINUX) + set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options) + set(BOOST_REGEX_LIBRARY boost_regex) + set(BOOST_SYSTEM_LIBRARY boost_system) + set(BOOST_FILESYSTEM_LIBRARY boost_filesystem) endif (WINDOWS) endif (STANDALONE) |