organicmaps/boost
13
Fork 0
mirror of https://github.com/boostorg/boost.git synced 2025-04-11 15:42:58 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Dont mangle version into include directory name when making package if

Browse source 
BUILD_VERSIONED is off. 




[SVN r50930]
This commit is contained in:
Troy D. Straszheim 2009-01-31 18:44:38 +00:00
parent 1ef498b293
commit 43b73602f1
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
CMakeLists.txt
View file

@ -103,6 +103,12 @@ 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)
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 @@ boost_add_extra_variant(PYTHON_NODEBUG PYTHON_DEBUG)
##########################################################################
# 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:

2
tools/build

@ -1 +1 @@
Subproject commit 9393a8212c2952473e5373fbdaab93ab133e4a9a
Subproject commit 0e9af404589f5e9f81acebdcb45d9495c83847fd