aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorelektrahesse2010-09-11 03:48:59 +0200
committerMcCabe Maxsted2010-09-10 19:12:06 -0700
commitf20989bff9a326d44b565d462a1ea5ff863c8548 (patch)
tree6cfbe56c201d6e2b52fa1ac2b8a75741341ad9c4 /linden
parentCode cleanup (diff)
downloadmeta-impy-f20989bff9a326d44b565d462a1ea5ff863c8548.zip
meta-impy-f20989bff9a326d44b565d462a1ea5ff863c8548.tar.gz
meta-impy-f20989bff9a326d44b565d462a1ea5ff863c8548.tar.bz2
meta-impy-f20989bff9a326d44b565d462a1ea5ff863c8548.tar.xz
Fixed Boost.cmake and removed the boost::system and boost::filesystem dependencies
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/cmake/Boost.cmake6
1 files changed, 0 insertions, 6 deletions
diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake
index 692902a..7741615 100644
--- a/linden/indra/cmake/Boost.cmake
+++ b/linden/indra/cmake/Boost.cmake
@@ -6,11 +6,9 @@ set(Boost_FIND_REQUIRED ON)
6 6
7if (STANDALONE) 7if (STANDALONE)
8 include(FindBoost) 8 include(FindBoost)
9 set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
10 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) 9 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
11 set(BOOST_REGEX_LIBRARY boost_regex-mt) 10 set(BOOST_REGEX_LIBRARY boost_regex-mt)
12 set(BOOST_SIGNALS_LIBRARY boost_signals-mt) 11 set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
13 set(BOOST_SYSTEM_LIBRARY boost_system-mt)
14else (STANDALONE) 12else (STANDALONE)
15 use_prebuilt_binary(boost) 13 use_prebuilt_binary(boost)
16 set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) 14 set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
@@ -39,16 +37,12 @@ else (STANDALONE)
39 debug libboost_signals-vc90-mt-gd-${BOOST_VERSION}) 37 debug libboost_signals-vc90-mt-gd-${BOOST_VERSION})
40 endif (MSVC80) 38 endif (MSVC80)
41 elseif (DARWIN) 39 elseif (DARWIN)
42 set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
43 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) 40 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
44 set(BOOST_REGEX_LIBRARY boost_regex-mt) 41 set(BOOST_REGEX_LIBRARY boost_regex-mt)
45 set(BOOST_SIGNALS_LIBRARY boost_signals-mt) 42 set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
46 set(BOOST_SYSTEM_LIBRARY boost_system-mt)
47 elseif (LINUX) 43 elseif (LINUX)
48 set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
49 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) 44 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
50 set(BOOST_REGEX_LIBRARY boost_regex-mt) 45 set(BOOST_REGEX_LIBRARY boost_regex-mt)
51 set(BOOST_SIGNALS_LIBRARY boost_signals-mt) 46 set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
52 set(BOOST_SYSTEM_LIBRARY boost_system-mt)
53 endif (WINDOWS) 47 endif (WINDOWS)
54endif (STANDALONE) 48endif (STANDALONE)