aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake
diff options
context:
space:
mode:
authorElektra Hesse2010-09-04 21:00:09 +0200
committerMcCabe Maxsted2010-09-04 16:52:06 -0700
commit96a3a589489ff61bf9e6e71fda3ab923b6c2869b (patch)
tree6709476bd84adadcb9aef599743058a23c8c7c51 /linden/indra/cmake
parentChanged version to 'Experimental 2010.09.04'. (diff)
downloadmeta-impy-96a3a589489ff61bf9e6e71fda3ab923b6c2869b.zip
meta-impy-96a3a589489ff61bf9e6e71fda3ab923b6c2869b.tar.gz
meta-impy-96a3a589489ff61bf9e6e71fda3ab923b6c2869b.tar.bz2
meta-impy-96a3a589489ff61bf9e6e71fda3ab923b6c2869b.tar.xz
Fixed Boost.cmake to correctly find the boost_system lib on mac
Diffstat (limited to 'linden/indra/cmake')
-rw-r--r--linden/indra/cmake/Boost.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake
index 90f39d2..692902a 100644
--- a/linden/indra/cmake/Boost.cmake
+++ b/linden/indra/cmake/Boost.cmake
@@ -10,7 +10,7 @@ if (STANDALONE)
10 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) 10 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
11 set(BOOST_REGEX_LIBRARY boost_regex-mt) 11 set(BOOST_REGEX_LIBRARY boost_regex-mt)
12 set(BOOST_SIGNALS_LIBRARY boost_signals-mt) 12 set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
13 set(BOOST_SYSTEM_LIBRARY boost_filesystem-mt) 13 set(BOOST_SYSTEM_LIBRARY boost_system-mt)
14else (STANDALONE) 14else (STANDALONE)
15 use_prebuilt_binary(boost) 15 use_prebuilt_binary(boost)
16 set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) 16 set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
@@ -43,7 +43,7 @@ else (STANDALONE)
43 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) 43 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
44 set(BOOST_REGEX_LIBRARY boost_regex-mt) 44 set(BOOST_REGEX_LIBRARY boost_regex-mt)
45 set(BOOST_SIGNALS_LIBRARY boost_signals-mt) 45 set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
46 set(BOOST_SYSTEM_LIBRARY boost_filesystem-mt) 46 set(BOOST_SYSTEM_LIBRARY boost_system-mt)
47 elseif (LINUX) 47 elseif (LINUX)
48 set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt) 48 set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
49 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) 49 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)