From 60f831151e41ccec184c4c6ecace86491fca36da Mon Sep 17 00:00:00 2001 From: "Mark Palange (Mani)" Date: Thu, 20 Jan 2011 11:03:53 -0800 Subject: Compile flag for wchar_t, boost 1_45 lib update, indra.l include ordering adjustment --- indra/cmake/00-Common.cmake | 4 ++-- indra/cmake/Boost.cmake | 36 +++++++++++++++++------------------- 2 files changed, 19 insertions(+), 21 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index dbe0cf5cd0..25a1b05d8e 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -61,7 +61,7 @@ if (WINDOWS) /Oy- ) - if(MSVC80 OR MSVC90) + if(MSVC) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" CACHE STRING "C++ compiler release options" FORCE) @@ -69,7 +69,7 @@ if (WINDOWS) add_definitions( /Zc:wchar_t- ) - endif (MSVC80 OR MSVC90) + endif (MSVC) # Are we using the crummy Visual Studio KDU build workaround? if (NOT VS_DISABLE_FATAL_WARNINGS) diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 012d3c2ab2..0b7eb7e99b 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -17,24 +17,8 @@ else (STANDALONE) set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) if (WINDOWS) - set(BOOST_VERSION 1_39) - if (MSVC71) - set(BOOST_PROGRAM_OPTIONS_LIBRARY - optimized libboost_program_options-vc71-mt-s-${BOOST_VERSION} - debug libboost_program_options-vc71-mt-sgd-${BOOST_VERSION}) - set(BOOST_REGEX_LIBRARY - optimized libboost_regex-vc71-mt-s-${BOOST_VERSION} - debug libboost_regex-vc71-mt-sgd-${BOOST_VERSION}) - set(BOOST_SIGNALS_LIBRARY - optimized libboost_signals-vc71-mt-s-${BOOST_VERSION} - debug libboost_signals-vc71-mt-sgd-${BOOST_VERSION}) - set(BOOST_SYSTEM_LIBRARY - optimized libboost_system-vc71-mt-s-${BOOST_VERSION} - debug libboost_system-vc71-mt-sgd-${BOOST_VERSION}) - set(BOOST_FILESYSTEM_LIBRARY - optimized libboost_filesystem-vc71-mt-s-${BOOST_VERSION} - debug libboost_filesystem-vc71-mt-sgd-${BOOST_VERSION}) - else (MSVC71) + set(BOOST_VERSION 1_45) + if(MSVC80) set(BOOST_PROGRAM_OPTIONS_LIBRARY optimized libboost_program_options-vc80-mt-${BOOST_VERSION} debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION}) @@ -50,7 +34,21 @@ else (STANDALONE) set(BOOST_FILESYSTEM_LIBRARY optimized libboost_filesystem-vc80-mt-${BOOST_VERSION} debug libboost_filesystem-vc80-mt-gd-${BOOST_VERSION}) - endif (MSVC71) + else(MSVC80) + # MSVC 10.0 config + set(BOOST_PROGRAM_OPTIONS_LIBRARY + optimized libboost_program_options-vc100-mt + debug libboost_program_options-vc100-mt-gd) + set(BOOST_REGEX_LIBRARY + optimized libboost_regex-vc100-mt + debug libboost_regex-vc100-mt-gd) + set(BOOST_SYSTEM_LIBRARY + optimized libboost_system-vc100-mt + debug libboost_system-vc100-mt-gd) + set(BOOST_FILESYSTEM_LIBRARY + optimized libboost_filesystem-vc100-mt + debug libboost_filesystem-vc100-mt-gd) + endif (MSVC80) elseif (DARWIN) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt) set(BOOST_REGEX_LIBRARY boost_regex-xgcc40-mt) -- cgit v1.3 From 6dd086794f5cf319fca1736a5803423b58d79d0b Mon Sep 17 00:00:00 2001 From: "Mark Palange (Mani)" Date: Mon, 24 Jan 2011 12:04:49 -0800 Subject: Updated boost lib --- autobuild.xml | 12 ++++++------ indra/cmake/Boost.cmake | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 340f774a9e..30e78729dd 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -210,9 +210,9 @@ archive hash - de5559c2c497544b3d0da533390175dc + 98be22c8833aa2bca184b9fa09fbb82b url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20101001a.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/219456/arch/CYGWIN/installer/boost-1.45.0-windows-20110124.tar.bz2 name windows @@ -1880,7 +1880,7 @@ windows build_directory - build-vc80 + build-vc100 configurations Debug @@ -1908,7 +1908,7 @@ options -G - "Visual Studio 8 2005" + "Visual Studio 10" name @@ -1939,7 +1939,7 @@ options -G - "Visual Studio 8 2005" + "Visual Studio 10" default @@ -1972,7 +1972,7 @@ options -G - "Visual Studio 8 2005" + "Visual Studio 10" name diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 0b7eb7e99b..b9c047a764 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -37,17 +37,17 @@ else (STANDALONE) else(MSVC80) # MSVC 10.0 config set(BOOST_PROGRAM_OPTIONS_LIBRARY - optimized libboost_program_options-vc100-mt - debug libboost_program_options-vc100-mt-gd) + optimized libboost_program_options-vc100-mt-${BOOST_VERSION} + debug libboost_program_options-vc100-mt-gd-${BOOST_VERSION}) set(BOOST_REGEX_LIBRARY - optimized libboost_regex-vc100-mt - debug libboost_regex-vc100-mt-gd) + optimized libboost_regex-vc100-mt-${BOOST_VERSION} + debug libboost_regex-vc100-mt-gd-${BOOST_VERSION}) set(BOOST_SYSTEM_LIBRARY - optimized libboost_system-vc100-mt - debug libboost_system-vc100-mt-gd) + optimized libboost_system-vc100-mt-${BOOST_VERSION} + debug libboost_system-vc100-mt-gd-${BOOST_VERSION}) set(BOOST_FILESYSTEM_LIBRARY - optimized libboost_filesystem-vc100-mt - debug libboost_filesystem-vc100-mt-gd) + optimized libboost_filesystem-vc100-mt-${BOOST_VERSION} + debug libboost_filesystem-vc100-mt-gd-${BOOST_VERSION}) endif (MSVC80) elseif (DARWIN) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt) -- cgit v1.3