Subject: [Boost-commit] svn:boost r50930 - in branches/release: . tools/build/CMake
From: troy_at_[hidden]
Date: 2009-01-31 13:44:38
Author: troy
Date: 2009-01-31 13:44:38 EST (Sat, 31 Jan 2009)
New Revision: 50930
URL: http://svn.boost.org/trac/boost/changeset/50930
Log:
Dont mangle version into include directory name when making package if
BUILD_VERSIONED is off.
Text files modified:
branches/release/CMakeLists.txt | 26 ++++++++++++++++++--------
branches/release/tools/build/CMake/BoostCore.cmake | 2 --
2 files changed, 18 insertions(+), 10 deletions(-)
Modified: branches/release/CMakeLists.txt
==============================================================================
--- branches/release/CMakeLists.txt (original)
+++ branches/release/CMakeLists.txt 2009-01-31 13:44:38 EST (Sat, 31 Jan 2009)
@@ -103,6 +103,12 @@
${BUILD_SINGLE_THREADED_DEFAULT})
option(BUILD_MULTI_THREADED "Whether to build multi-threaded libraries" ON)
+if(UNIX)
+ option(BUILD_VERSIONED "Add versioning information to names of built files" OFF)
+else(UNIX)
+ option(BUILD_VERSIONED "Add versioning information to names of built files" ON)
+endif(UNIX)
+
# For now, we only actually support static/dynamic run-time variants for
# Visual C++. Provide both options for Visual C++ users, but just fix
# the values of the variables for all other platforms.
@@ -128,17 +134,21 @@
##########################################################################
# Installation #
##########################################################################
-if(BOOST_VERSION_SUBMINOR GREATER 0)
- set(BOOST_HEADER_DIR
+if(BUILD_VERSIONED)
+ if(BOOST_VERSION_SUBMINOR GREATER 0)
+ set(BOOST_HEADER_DIR
"include/boost-${BOOST_VERSION_MAJOR}_${BOOST_VERSION_MINOR}_${BOOST_VERSION_SUBMINOR}")
-else(BOOST_VERSION_SUBMINOR GREATER 0)
- set(BOOST_HEADER_DIR
+ else(BOOST_VERSION_SUBMINOR GREATER 0)
+ set(BOOST_HEADER_DIR
"include/boost-${BOOST_VERSION_MAJOR}_${BOOST_VERSION_MINOR}")
-endif(BOOST_VERSION_SUBMINOR GREATER 0)
+ endif(BOOST_VERSION_SUBMINOR GREATER 0)
+else(BUILD_VERSIONED)
+ set(BOOST_HEADER_DIR "include/")
+endif(BUILD_VERSIONED)
install(DIRECTORY boost
- DESTINATION ${BOOST_HEADER_DIR}
- PATTERN "CVS" EXCLUDE
- PATTERN ".svn" EXCLUDE)
+ DESTINATION ${BOOST_HEADER_DIR}
+ PATTERN "CVS" EXCLUDE
+ PATTERN ".svn" EXCLUDE)
#
# TDS 20080526: Getting a segfault here even with the ifs. At r45780, with these lines
# uncommented:
Modified: branches/release/tools/build/CMake/BoostCore.cmake
==============================================================================
--- branches/release/tools/build/CMake/BoostCore.cmake (original)
+++ branches/release/tools/build/CMake/BoostCore.cmake 2009-01-31 13:44:38 EST (Sat, 31 Jan 2009)
@@ -449,8 +449,6 @@
# 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 "")