diff options
author | elektrahesse | 2010-09-11 03:48:59 +0200 |
---|---|---|
committer | elektrahesse | 2010-09-11 03:48:59 +0200 |
commit | 6a57c87c0d90c65c0f0d9ba5e90c20b111420c43 (patch) | |
tree | 48d0647e83d434e4eeaf66d1c6ba2cbc54112a4b /linden | |
parent | Code cleanup (diff) | |
download | meta-impy-6a57c87c0d90c65c0f0d9ba5e90c20b111420c43.zip meta-impy-6a57c87c0d90c65c0f0d9ba5e90c20b111420c43.tar.gz meta-impy-6a57c87c0d90c65c0f0d9ba5e90c20b111420c43.tar.bz2 meta-impy-6a57c87c0d90c65c0f0d9ba5e90c20b111420c43.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.cmake | 6 |
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 | ||
7 | if (STANDALONE) | 7 | if (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) | ||
14 | else (STANDALONE) | 12 | else (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) |
54 | endif (STANDALONE) | 48 | endif (STANDALONE) |