[Boost-commit] svn:boost r7157

From: dgregor_at_[hidden]
Date: 2007-06-25 22:22:55

Author: dgregor
Date: 2007-06-25 22:22:54 EDT (Mon, 25 Jun 2007)
New Revision: 7157
URL: http://svn.boost.org/trac/boost/changeset/7157

Log:
- Request compatibility with CMake 2.4
- Default to "Release" mode with makefile generators
- Limit configurations to Debug and Release
- Mark some variables as "internal" when we eliminate them

Text files modified: 
   sandbox-branches/boost-cmake/boost_1_34_0/CMakeLists.txt                      |     3 ++-                                     
   sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostConfig.cmake |    17 ++++++++++++++---                       
   sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostCore.cmake   |     6 +++---                                  
   3 files changed, 19 insertions(+), 7 deletions(-)

Modified: sandbox-branches/boost-cmake/boost_1_34_0/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/CMakeLists.txt	(original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/CMakeLists.txt	2007-06-25 22:22:54 EDT (Mon, 25 Jun 2007)
@@ -24,7 +24,8 @@
 #                                                                        #
 # For more information about CMake, see http://www.cmake.org             #
 ##########################################################################
-cmake_minimum_required(VERSION 2.4.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR)
+set(CMAKE_BACKWARDS_COMPATIBILITY 2.4)
 project(Boost)
 
 ##########################################################################

Modified: sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostConfig.cmake
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostConfig.cmake	(original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostConfig.cmake	2007-06-25 22:22:54 EDT (Mon, 25 Jun 2007)
@@ -109,12 +109,23 @@
   set(RELEASE_LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}" CACHE STRING "Link flags for release libraries")
 endif(CMAKE_SHARED_LINKER_FLAGS_RELEASE)
 
+# Tweak the configuration and build types appropriately.
+if(CMAKE_CONFIGURATION_TYPES)
+  # Limit CMAKE_CONFIGURATION_TYPES to Debug and Release
+  set(CMAKE_CONFIGURATION_TYPES "Debug;Release")
+else(CMAKE_CONFIGURATION_TYPES)
+  # Build in release mode by default
+  if (NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are Release or Debug" FORCE)
+  endif (NOT CMAKE_BUILD_TYPE)
+endif(CMAKE_CONFIGURATION_TYPES)
+
 # For project file generators that have multiple configurations,
 # clear out the built-in C++ compiler and link flags for each of the 
 # configurations.
 foreach(CONFIG ${CMAKE_CONFIGURATION_TYPES})
   string(TOUPPER ${CONFIG} UCONFIG)
-  set(CMAKE_CXX_FLAGS_${UCONFIG} "" CACHE STRING "Unused by Boost" FORCE)
-  set(CMAKE_SHARED_LINKER_FLAGS_${UCONFIG} "" CACHE STRING "Unused by Boost" FORCE)
-  set(CMAKE_MODULE_LINKER_FLAGS_${UCONFIG} "" CACHE STRING "Unused by Boost" FORCE)
+  set(CMAKE_CXX_FLAGS_${UCONFIG} "" CACHE INTERNAL "Unused by Boost")
+  set(CMAKE_SHARED_LINKER_FLAGS_${UCONFIG} "" CACHE INTERNAL "Unused by Boost")
+  set(CMAKE_MODULE_LINKER_FLAGS_${UCONFIG} "" CACHE INTERNAL "Unused by Boost")
 endforeach(CONFIG ${CMAKE_CONFIGURATION_TYPES})

Modified: sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostCore.cmake
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostCore.cmake	(original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostCore.cmake	2007-06-25 22:22:54 EDT (Mon, 25 Jun 2007)
@@ -699,8 +699,8 @@
 #                        [feature]
 #                        [NO_INSTALL])
 #
-# where exename is the name of the executable (e.g., "wave") source1,
-# source2, etc. are the source files used to build the library, e.g.,
+# where exename is the name of the executable (e.g., "wave").  source1,
+# source2, etc. are the source files used to build the executable, e.g.,
 # cpp.cpp. If no source files are provided, "exename.cpp" will be
 # used.
 #
@@ -750,7 +750,7 @@
 #   LINK_LIBS, this option states that the executable will link
 #   against the stated libraries. Unlike LINK_LIBS, however, DEPENDS
 #   takes particular library variants into account, always linking to
-#   the appropriate variant of one Boost library. For example, if the
+#   the appropriate variant of a Boost library. For example, if the
 #   MULTI_THREADED feature was requested in the call to
 #   boost_add_executable, DEPENDS will ensure that we only link
 #   against multi-threaded libraries.