diff options
| author | Andrew de Laix <alain@lindenlab.com> | 2011-03-10 17:53:15 +0000 |
|---|---|---|
| committer | Andrew de Laix <alain@lindenlab.com> | 2011-03-10 17:53:15 +0000 |
| commit | acec15e723c066efc6eb1e38c98b7af4e9993809 (patch) | |
| tree | bb007d9f568c9af36447220ee98cec152665b83c | |
| parent | 871677dc0bb391f05c3dadd34e7a41eec241e413 (diff) | |
update boost archive usage for linux.
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rw-r--r-- | indra/cmake/Boost.cmake | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/autobuild.xml b/autobuild.xml index 0e7a6b8ee3..c85a273a99 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -198,9 +198,9 @@ <key>archive</key> <map> <key>hash</key> - <string>cb7cbafb06b878adf423db314b1787df</string> + <string>a34e7fffdb94a6a4d8a2966b1f216da3</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100929a.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/223302/arch/Linux/installer/boost-1.45.0-linux-20110310.tar.bz2</string> </map> <key>name</key> <string>linux</string> diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 67dc9f0891..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) + elseif (DARWIN OR LINUX) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options) set(BOOST_REGEX_LIBRARY boost_regex) -# set(BOOST_SIGNALS_LIBRARY boost_signals) set(BOOST_SYSTEM_LIBRARY boost_system) set(BOOST_FILESYSTEM_LIBRARY boost_filesystem) - 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) endif (WINDOWS) endif (STANDALONE) |