[Boost-commit] svn:boost r45772 - branches/CMake/release/tools/build/CMake

From: troy_at_[hidden]
Date: 2008-05-26 11:14:04

Author: troy
Date: 2008-05-26 11:14:04 EDT (Mon, 26 May 2008)
New Revision: 45772
URL: http://svn.boost.org/trac/boost/changeset/45772

Log:

Bring back handy option BUILD_VERSIONED.  This somehow disappeared
along the way.

Text files modified: 
   branches/CMake/release/tools/build/CMake/BoostCore.cmake |    30 ++++++++++++++++++++----------          
   1 files changed, 20 insertions(+), 10 deletions(-)

Modified: branches/CMake/release/tools/build/CMake/BoostCore.cmake
==============================================================================
--- branches/CMake/release/tools/build/CMake/BoostCore.cmake	(original)
+++ branches/CMake/release/tools/build/CMake/BoostCore.cmake	2008-05-26 11:14:04 EDT (Mon, 26 May 2008)
@@ -327,15 +327,23 @@
 #   particular version of the library and the toolset used to build
 #   this library. For example, this might be "-gcc41-mt-1_34" for the
 #   multi-threaded, release variant of the library in Boost 1.34.0 as
-#   compiled with GCC 4.1.
+#   compiled with GCC 4.1.  If option BUILD_VERSIONED is OFF, this 
+#   variable is set to the empty string.
 #
 #   VARIANT_DISPLAY_NAME: The display name that describes this
 #   variant, e.g., "Debug, static, multi-threaded".
+#
+option(BUILD_VERSIONED "Add versioning information to names of built files" ON)
+
 macro(boost_library_variant_target_name)
   set(VARIANT_TARGET_NAME "")
 
   # The versioned name starts with the full Boost toolset
-  set(VARIANT_VERSIONED_NAME "-${BOOST_TOOLSET}")
+  if(BUILD_VERSIONED)
+    set(VARIANT_VERSIONED_NAME "-${BOOST_TOOLSET}")
+  else(BUILD_VERSIONED)
+    set(VARIANT_VERSIONED_NAME "")
+  endif(BUILD_VERSIONED)
 
   # Add -mt for multi-threaded libraries
   list_contains(VARIANT_IS_MT MULTI_THREADED ${ARGN})
@@ -411,14 +419,16 @@
     set(VARIANT_VERSIONED_NAME "${VARIANT_VERSIONED_NAME}-${VARIANT_ABI_TAG}")
   endif (VARIANT_ABI_TAG)
 
-  # Append the Boost version number to the versioned name
-  if(BOOST_VERSION_SUBMINOR GREATER 0)
-    set(VARIANT_VERSIONED_NAME
-      "${VARIANT_VERSIONED_NAME}-${BOOST_VERSION_MAJOR}_${BOOST_VERSION_MINOR}_${BOOST_VERSION_SUBMINOR}")
-  else(BOOST_VERSION_SUBMINOR GREATER 0)
-    set(VARIANT_VERSIONED_NAME 
-      "${VARIANT_VERSIONED_NAME}-${BOOST_VERSION_MAJOR}_${BOOST_VERSION_MINOR}")
-  endif(BOOST_VERSION_SUBMINOR GREATER 0)
+  if(BUILD_VERSIONED)
+    # Append the Boost version number to the versioned name
+    if(BOOST_VERSION_SUBMINOR GREATER 0)
+      set(VARIANT_VERSIONED_NAME
+	"${VARIANT_VERSIONED_NAME}-${BOOST_VERSION_MAJOR}_${BOOST_VERSION_MINOR}_${BOOST_VERSION_SUBMINOR}")
+    else(BOOST_VERSION_SUBMINOR GREATER 0)
+      set(VARIANT_VERSIONED_NAME 
+	"${VARIANT_VERSIONED_NAME}-${BOOST_VERSION_MAJOR}_${BOOST_VERSION_MINOR}")
+    endif(BOOST_VERSION_SUBMINOR GREATER 0)
+  endif(BUILD_VERSIONED)
 endmacro(boost_library_variant_target_name)
 
 # This macro is an internal utility macro that updates compilation and