[Boost-commit] svn:boost r45680 - branches/CMake/release

From: dgregor_at_[hidden]
Date: 2008-05-23 10:47:23

Author: dgregor
Date: 2008-05-23 10:47:22 EDT (Fri, 23 May 2008)
New Revision: 45680
URL: http://svn.boost.org/trac/boost/changeset/45680

Log:
Bump version to 1.35.1 and tweak the way we turn off single-threaded libraries for MSVC
Text files modified: 
   branches/CMake/release/CMakeLists.txt |    18 +++++++++++-------                      
   1 files changed, 11 insertions(+), 7 deletions(-)

Modified: branches/CMake/release/CMakeLists.txt
==============================================================================
--- branches/CMake/release/CMakeLists.txt	(original)
+++ branches/CMake/release/CMakeLists.txt	2008-05-23 10:47:22 EDT (Fri, 23 May 2008)
@@ -32,7 +32,7 @@
 ##########################################################################
 set(BOOST_VERSION_MAJOR 1)
 set(BOOST_VERSION_MINOR 35)
-set(BOOST_VERSION_SUBMINOR 0)
+set(BOOST_VERSION_SUBMINOR 1)
 set(BOOST_VERSION "${BOOST_VERSION_MAJOR}.${BOOST_VERSION_MINOR}.${BOOST_VERSION_SUBMINOR}")
 ##########################################################################
 
@@ -50,12 +50,20 @@
 # Build Features and Variants                                            #
 ##########################################################################
 
+# Determine default settings for the variable BUILD_feature options
+if (MSVC)
+  set(BUILD_SINGLE_THREADED_DEFAULT OFF)
+else ()
+  set(BUILD_SINGLE_THREADED_DEFAULT ON)
+endif ()
+
 # User-level options deciding which variants we will build. 
 option(BUILD_STATIC "Whether to build static libraries" ON)
 option(BUILD_SHARED "Whether to build shared libraries" ON)
 option(BUILD_DEBUG "Whether to build debugging libraries" ON)
 option(BUILD_RELEASE "Whether to build release libraries" ON)
-option(BUILD_SINGLE_THREADED "Whether to build single-threaded libraries" ON)
+option(BUILD_SINGLE_THREADED "Whether to build single-threaded libraries" 
+       ${BUILD_SINGLE_THREADED_DEFAULT})
 option(BUILD_MULTI_THREADED "Whether to build multi-threaded libraries" ON)
 
 # For now, we only actually support static/dynamic run-time variants for 
@@ -72,11 +80,7 @@
 # The default set of library variants that we will be building
 boost_add_default_variant(RELEASE DEBUG)
 boost_add_default_variant(STATIC SHARED)
-if(MSVC)
-  boost_add_default_variant(MULTI_THREADED)
-else(MSVC)
-  boost_add_default_variant(SINGLE_THREADED MULTI_THREADED)
-endif(MSVC)
+boost_add_default_variant(SINGLE_THREADED MULTI_THREADED)
 boost_add_default_variant(DYNAMIC_RUNTIME STATIC_RUNTIME)
 
 # Extra features used by some libraries