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

Changing the initial warning to the user for first time run of CMake so that the user needs to enter "-DCMAKE_IS_EXPERIMENTAL:bool=TRUE' instead of having to uncomment code in the CMake file. This is only needed one time during the initial run of CMake on the boost source directory.

Browse source 
[SVN r49913]
This commit is contained in:
Michael A. Jackson 2008-11-24 15:38:22 +00:00
parent 75c198c9f1
commit 42bc6570e9
2 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
CMakeLists.txt
View file

@ -32,13 +32,16 @@ project(Boost)
# Post a warning to those attempting to use the CMake Build system. When #
# the build system stabilizes this can be removed. #
##########################################################################
if (NOT CMAKE_IS_EXPERIMENTAL)
message(STATUS "##########################################################################")
message(STATUS " THE CMAKE BUILD SYSTEM IS CURRENTLY UNDER DEVELOPMENT. PLEASE USE THE ")
message(STATUS " BJAM BASED SYSTEM INSTEAD. IF YOU STILL WANT TO TRY IT OUT PLEASE COMMENT")
message(STATUS " OUT THE LINE 'message(FATAL_ERROR \"\")' THAT APPEARS IN THE FILE ")
message(STATUS " ${Boost_SOURCE_DIR}/CMakeLists.txt FILE.")
message(STATUS " BJAM BASED SYSTEM INSTEAD TO BUILD A PRODUCTION VERSION OF BOOST. IF YOU ")
message(STATUS " STILL WANT TO TRY IT OUT INVOKE CMake WITH '-DCMAKE_IS_EXPERIMENTAL:boolean=TRUE'")
message(STATUS " ARGUMENT. After this first run of cmake you will no longer have to supply")
message(STATUS " the argument unless you need to run a cmake on a clean build directory.")
message(STATUS "##########################################################################")
#message(FATAL_ERROR "")
message(FATAL_ERROR "")
endif (NOT CMAKE_IS_EXPERIMENTAL)
##########################################################################
# Version information #
@ -55,24 +58,8 @@ set(BOOST_VERSION "${BOOST_VERSION_MAJOR}.${BOOST_VERSION_MINOR}.${BOOST_VERSION
# tree rather than installed Boost libraries.
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
if (FALSE)
# ---------- Setup output Directories -------------------------
SET (LIBRARY_OUTPUT_PATH
${PROJECT_BINARY_DIR}/lib
CACHE PATH
"Directory for all Libraries"
)
# --------- Setup the Executable output Directory -------------
SET (EXECUTABLE_OUTPUT_PATH
${PROJECT_BINARY_DIR}/bin
CACHE PATH
"Directory for all Executables."
)
endif(FALSE)
##########################################################################
# Boost CMake modules #
##########################################################################
@ -212,7 +199,7 @@ include(CPack)
if(COMMAND cpack_configure_downloads)
cpack_configure_downloads(
"http://www.osl.iu.edu/~dgregor/Boost-CMake/1.36.0/"
"http://www.osl.iu.edu/~dgregor/Boost-CMake/${BOOST_VERSION}/"
ALL ADD_REMOVE)
endif()
##########################################################################

2
tools/build

@ -1 +1 @@
Subproject commit 2836ddf5d4f86a8494e41d91d15ae1d94c72e3fd
Subproject commit 8b8b78dd37b1fccc2b8940d2c51ca12603fd698b