diff options
| author | McCabe Maxsted | 2009-11-10 13:58:38 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-11-10 13:58:38 -0700 |
| commit | 25b13a129b1617a8d3036213472b1c34122a5e7e (patch) | |
| tree | 0f35b94bd42a753544cdf420ab70230b15013e8c /linden/indra/cmake | |
| parent | Fixed llstartup header issue and removed WIN32_LEAN_AND_MEAN define (diff) | |
| download | meta-impy-25b13a129b1617a8d3036213472b1c34122a5e7e.zip meta-impy-25b13a129b1617a8d3036213472b1c34122a5e7e.tar.gz meta-impy-25b13a129b1617a8d3036213472b1c34122a5e7e.tar.bz2 meta-impy-25b13a129b1617a8d3036213472b1c34122a5e7e.tar.xz | |
Viewer compiles, but still trying to get everything to link on Windows
Diffstat (limited to 'linden/indra/cmake')
| -rw-r--r-- | linden/indra/cmake/Boost.cmake | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake index 0578ae9..50b8eff 100644 --- a/linden/indra/cmake/Boost.cmake +++ b/linden/indra/cmake/Boost.cmake | |||
| @@ -15,18 +15,18 @@ else (STANDALONE) | |||
| 15 | set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) | 15 | set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) |
| 16 | 16 | ||
| 17 | if (WINDOWS) | 17 | if (WINDOWS) |
| 18 | set(BOOST_VERSION 1_34_1) | 18 | set(BOOST_VERSION 1_36) |
| 19 | if (MSVC71) | 19 | if (MSVC71) |
| 20 | set(BOOST_PROGRAM_OPTIONS_LIBRARY | 20 | set(BOOST_PROGRAM_OPTIONS_LIBRARY |
| 21 | optimized libboost_program_options-vc71-mt-s-${BOOST_VERSION} | 21 | optimized libboost_program_options-vc71-mt-${BOOST_VERSION} |
| 22 | debug libboost_program_options-vc71-mt-sgd-${BOOST_VERSION}) | 22 | debug libboost_program_options-vc71-mt-gd-${BOOST_VERSION}) |
| 23 | set(BOOST_REGEX_LIBRARY | 23 | set(BOOST_REGEX_LIBRARY |
| 24 | optimized libboost_regex-vc71-mt-s-${BOOST_VERSION} | 24 | optimized libboost_regex-vc71-mt-${BOOST_VERSION} |
| 25 | debug libboost_regex-vc71-mt-sgd-${BOOST_VERSION}) | 25 | debug libboost_regex-vc71-mt-gd-${BOOST_VERSION}) |
| 26 | set(BOOST_SIGNALS_LIBRARY | 26 | set(BOOST_SIGNALS_LIBRARY |
| 27 | optimized libboost_signals-vc71-mt-s-${BOOST_VERSION} | 27 | optimized libboost_signals-vc71-mt-${BOOST_VERSION} |
| 28 | debug libboost_signals-vc71-mt-sgd-${BOOST_VERSION}) | 28 | debug libboost_signals-vc71-mt-gd-${BOOST_VERSION}) |
| 29 | else (MSVC71) | 29 | elseif (MSVC80) |
| 30 | set(BOOST_PROGRAM_OPTIONS_LIBRARY | 30 | set(BOOST_PROGRAM_OPTIONS_LIBRARY |
| 31 | optimized libboost_program_options-vc80-mt-${BOOST_VERSION} | 31 | optimized libboost_program_options-vc80-mt-${BOOST_VERSION} |
| 32 | debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION}) | 32 | debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION}) |
| @@ -36,6 +36,16 @@ else (STANDALONE) | |||
| 36 | set(BOOST_SIGNALS_LIBRARY | 36 | set(BOOST_SIGNALS_LIBRARY |
| 37 | optimized libboost_signals-vc80-mt-${BOOST_VERSION} | 37 | optimized libboost_signals-vc80-mt-${BOOST_VERSION} |
| 38 | debug libboost_signals-vc80-mt-gd-${BOOST_VERSION}) | 38 | debug libboost_signals-vc80-mt-gd-${BOOST_VERSION}) |
| 39 | elseif (MSVC90) | ||
| 40 | set(BOOST_PROGRAM_OPTIONS_LIBRARY | ||
| 41 | optimized libboost_program_options-vc90-mt-${BOOST_VERSION} | ||
| 42 | debug libboost_program_options-vc90-mt-gd-${BOOST_VERSION}) | ||
| 43 | set(BOOST_REGEX_LIBRARY | ||
| 44 | optimized libboost_regex-vc90-mt-${BOOST_VERSION} | ||
| 45 | debug libboost_regex-vc90-mt-gd-${BOOST_VERSION}) | ||
| 46 | set(BOOST_SIGNALS_LIBRARY | ||
| 47 | optimized libboost_signals-vc90-mt-${BOOST_VERSION} | ||
| 48 | debug libboost_signals-vc90-mt-gd-${BOOST_VERSION}) | ||
| 39 | endif (MSVC71) | 49 | endif (MSVC71) |
| 40 | elseif (DARWIN) | 50 | elseif (DARWIN) |
| 41 | set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) | 51 | set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) |