From: troy_at_[hidden]
Date: 2007-05-20 09:24:43
Author: troy
Date: 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
New Revision: 4144
URL: http://svn.boost.org/trac/boost/changeset/4144
Log:
boost_library_subproject -> boost_library_project for consistency with
cmake's PROJECT() macro and the ${PROJECT_NAME} variable that it sets.
Add -pthread -lrt flags to a few config tests on linux. Need an
overall scheme for handling this.
Text files modified:
sandbox/troy/boost_1_34_0/libs/algorithm/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/any/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/array/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/assign/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/bind/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/concept_check/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/config/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/config/test/CMakeLists.txt | 16 +++++++++++++---
sandbox/troy/boost_1_34_0/libs/conversion/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/crc/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/date_time/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/disjoint_sets/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/dynamic_bitset/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/filesystem/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/foreach/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/format/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/function/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/functional/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/graph/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/integer/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/io/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/iostreams/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/iterator/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/lambda/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/logic/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/math/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/mpl/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/preprocessor/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/regex/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/serialization/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/signals/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/test/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/wave/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/xpressive/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/tools/build/CMake/boost-core.cmake | 28 ++++++++++++++++++----------
sandbox/troy/boost_1_34_0/tools/build/CMake/testing/a/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/tools/build/CMake/testing/b/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/tools/build/CMake/testing/c/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/tools/build/CMake/testing/d/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/tools/build/CMake/testing/e/CMakeLists.txt | 2 +-
40 files changed, 69 insertions(+), 51 deletions(-)
Modified: sandbox/troy/boost_1_34_0/libs/algorithm/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/algorithm/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/algorithm/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Algorithm
TESTDIRS minmax/test string/test
)
Modified: sandbox/troy/boost_1_34_0/libs/any/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/any/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/any/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Any
TESTDIRS test
)
Modified: sandbox/troy/boost_1_34_0/libs/array/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/array/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/array/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Array
TESTDIRS test
)
Modified: sandbox/troy/boost_1_34_0/libs/assign/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/assign/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/assign/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Assign
TESTDIRS test
)
Modified: sandbox/troy/boost_1_34_0/libs/bind/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/bind/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/bind/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Bind
TESTDIRS test
)
Modified: sandbox/troy/boost_1_34_0/libs/concept_check/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/concept_check/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/concept_check/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Concept_check
TESTDIRS test
)
Modified: sandbox/troy/boost_1_34_0/libs/config/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/config/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/config/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,3 +1,3 @@
-boost_library_subproject(
+boost_library_project(
Config
TESTDIRS test)
Modified: sandbox/troy/boost_1_34_0/libs/config/test/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/config/test/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/config/test/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -9,7 +9,18 @@
# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
boost_test_run(config_info)
boost_test_run(math_info)
-boost_test_run(config_test)
+
+# this should go in some factored-out toolset area (?)
+if(CMAKE_COMPILER_IS_GNUCC)
+ boost_test_run(config_test LIBRARIES pthread rt)
+ boost_test_run(has_clock_gettime_pass LIBRARIES pthread rt)
+ boost_test_run(has_pthread_ma_st_pass LIBRARIES pthread rt)
+elseif(CMAKE_COMPILER_IS_GNUCC)
+ boost_test_run(config_test)
+ boost_test_run(has_clock_gettime_pass)
+ boost_test_run(has_pthread_ma_st_pass)
+endif(CMAKE_COMPILER_IS_GNUCC)
+
boost_test_run(limits_test LIBRARIES boost_test_exec_monitor-static)
boost_test_run(abi_test SOURCES abi/abi_test.cpp abi/main.cpp)
@@ -17,7 +28,6 @@
boost_test_compile_fail(has_2arg_use_facet_fail)
boost_test_run(has_bethreads_pass)
boost_test_compile_fail(has_bethreads_fail)
-boost_test_run(has_clock_gettime_pass)
boost_test_compile_fail(has_clock_gettime_fail)
boost_test_run(has_dirent_h_pass)
boost_test_compile_fail(has_dirent_h_fail)
@@ -47,7 +57,7 @@
boost_test_compile_fail(has_part_alloc_fail)
boost_test_run(has_pthread_delay_np_pass)
boost_test_compile_fail(has_pthread_delay_np_fail)
-boost_test_run(has_pthread_ma_st_pass)
+
boost_test_compile_fail(has_pthread_ma_st_fail)
boost_test_run(has_pthread_yield_pass)
boost_test_compile_fail(has_pthread_yield_fail)
Modified: sandbox/troy/boost_1_34_0/libs/conversion/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/conversion/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/conversion/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Conversion
TESTDIRS test
)
Modified: sandbox/troy/boost_1_34_0/libs/crc/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/crc/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/crc/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
CRC
TESTDIRS test
)
Modified: sandbox/troy/boost_1_34_0/libs/date_time/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/date_time/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/date_time/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Date_time
SRCDIRS src
TESTDIRS test
Modified: sandbox/troy/boost_1_34_0/libs/disjoint_sets/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/disjoint_sets/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/disjoint_sets/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Disjoint_sets
TESTDIRS test
)
\ No newline at end of file
Modified: sandbox/troy/boost_1_34_0/libs/dynamic_bitset/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/dynamic_bitset/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/dynamic_bitset/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Dynamic_bitset
TESTDIRS test
)
\ No newline at end of file
Modified: sandbox/troy/boost_1_34_0/libs/filesystem/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/filesystem/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/filesystem/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Filesystem
SRCDIRS src
TESTDIRS test
Modified: sandbox/troy/boost_1_34_0/libs/foreach/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/foreach/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/foreach/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Foreach
TESTDIRS test
)
Modified: sandbox/troy/boost_1_34_0/libs/format/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/format/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/format/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Format
TESTDIRS test
)
Modified: sandbox/troy/boost_1_34_0/libs/function/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/function/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/function/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1 +1 @@
-boost_library_subproject(Function TESTDIRS test)
+boost_library_project(Function TESTDIRS test)
Modified: sandbox/troy/boost_1_34_0/libs/functional/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/functional/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/functional/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Functional
TESTDIRS test hash/test hash/examples
)
Modified: sandbox/troy/boost_1_34_0/libs/graph/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/graph/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/graph/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Graph
SRCDIRS src
TESTDIRS test
Modified: sandbox/troy/boost_1_34_0/libs/integer/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/integer/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/integer/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Integer
TESTDIRS test
)
\ No newline at end of file
Modified: sandbox/troy/boost_1_34_0/libs/io/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/io/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/io/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,2 +1,2 @@
-boost_library_subproject(IO
+boost_library_project(IO
TESTDIRS test)
\ No newline at end of file
Modified: sandbox/troy/boost_1_34_0/libs/iostreams/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/iostreams/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/iostreams/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
IOStreams
SRCDIRS src
TESTDIRS test
Modified: sandbox/troy/boost_1_34_0/libs/iterator/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/iterator/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/iterator/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Iterator
TESTDIRS test
)
\ No newline at end of file
Modified: sandbox/troy/boost_1_34_0/libs/lambda/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/lambda/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/lambda/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Lambda
TESTDIRS test
)
\ No newline at end of file
Modified: sandbox/troy/boost_1_34_0/libs/logic/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/logic/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/logic/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Logic
TESTDIRS test
)
\ No newline at end of file
Modified: sandbox/troy/boost_1_34_0/libs/math/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/math/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/math/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Math
TESTDIRS test
)
\ No newline at end of file
Modified: sandbox/troy/boost_1_34_0/libs/mpl/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/mpl/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/mpl/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Metaprogramming
TESTDIRS test
)
Modified: sandbox/troy/boost_1_34_0/libs/preprocessor/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/preprocessor/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/preprocessor/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Preprocessor
TESTDIRS test
)
\ No newline at end of file
Modified: sandbox/troy/boost_1_34_0/libs/regex/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/regex/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/regex/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Regex
SRCDIRS src
)
\ No newline at end of file
Modified: sandbox/troy/boost_1_34_0/libs/serialization/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/serialization/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/serialization/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Serialization
SRCDIRS src
)
Modified: sandbox/troy/boost_1_34_0/libs/signals/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/signals/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/signals/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Signals
SRCDIRS src
TESTDIRS test
Modified: sandbox/troy/boost_1_34_0/libs/test/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/test/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/test/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Test
SRCDIRS src
TESTDIRS test
Modified: sandbox/troy/boost_1_34_0/libs/wave/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/wave/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/wave/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Wave
SRCDIRS src
TESTDIRS test
Modified: sandbox/troy/boost_1_34_0/libs/xpressive/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/xpressive/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/xpressive/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
Xpressive
TESTDIRS test
)
Modified: sandbox/troy/boost_1_34_0/tools/build/CMake/boost-core.cmake
==============================================================================
--- sandbox/troy/boost_1_34_0/tools/build/CMake/boost-core.cmake (original)
+++ sandbox/troy/boost_1_34_0/tools/build/CMake/boost-core.cmake 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -126,9 +126,9 @@
endif(USE_VERSIONING)
-# Defines a Boost library subproject (e.g., for Boost.Python). Use as:
+# Defines a Boost library project (e.g., for Boost.Python). Use as:
#
-# boost_library_subproject(libname, subdir1, subdir2, ...)
+# boost_library_project(libname, subdir1, subdir2, ...)
#
# where libname is the name of the library (e.g., Python, or
# Filesystem) and subdir1, subdir2, etc. are the subdirectories that
@@ -139,26 +139,34 @@
# subdirectories; otherwise, none of the subdirectories will be
# included, so the library itself will not be built, installed, or
# tested.
-macro(boost_library_subproject libname_)
- parse_arguments(THIS_SUBPROJECT
+macro(boost_library_project libname_)
+ parse_arguments(THIS_PROJECT
"SRCDIRS;TESTDIRS"
""
${ARGN}
)
string(TOUPPER "BUILD_BOOST_${libname_}" BOOST_BUILD_LIB_OPTION)
- if (THIS_SUBPROJECT_SRCDIRS)
+ if (THIS_PROJECT_SRCDIRS)
# This Boost library has source directories, so provide an option
# BUILD_BOOST_LIBNAME that allows one to turn on/off building of
# the library.
option(${BOOST_BUILD_LIB_OPTION}
"Build Boost.${libname_} (prefer make targets, not this, to build individual libs)"
ON)
- else (THIS_SUBPROJECT_SRCDIRS)
+ else (THIS_PROJECT_SRCDIRS)
# This Boost library has no source directories, and therefore does
# not require building. Always enable it.
set(${BOOST_BUILD_LIB_OPTION} ON)
- endif (THIS_SUBPROJECT_SRCDIRS)
+ endif (THIS_PROJECT_SRCDIRS)
+
+ if (THIS_PROJECT_TESTDIRS)
+ string(TOUPPER "TEST_BOOST_${libname_}" BOOST_TEST_LIB_OPTION)
+ option(${BOOST_TEST_LIB_OPTION}
+ "Enable testing of Boost.${libname_}"
+ ON)
+ endif (THIS_PROJECT_TESTDIRS)
+
if(${BOOST_BUILD_LIB_OPTION})
string(TOLOWER "${libname_}" libname)
@@ -172,11 +180,11 @@
# that they would need to be kept separate and scanned in order
# CLEANUP: put src/test dirs back together again, if no future
# need for it comes up
- foreach(SUBDIR ${THIS_SUBPROJECT_SRCDIRS} ${THIS_SUBPROJECT_TESTDIRS})
+ foreach(SUBDIR ${THIS_PROJECT_SRCDIRS} ${THIS_PROJECT_TESTDIRS})
add_subdirectory(${SUBDIR})
- endforeach(SUBDIR ${THIS_SUBPROJECT_SRCDIRS} ${THIS_SUBPROJECT_TESTDIRS})
+ endforeach(SUBDIR ${THIS_PROJECT_SRCDIRS} ${THIS_PROJECT_TESTDIRS})
endif(${BOOST_BUILD_LIB_OPTION})
-endmacro(boost_library_subproject)
+endmacro(boost_library_project)
macro(push_back_target_property target property pushvalue)
get_target_property(oldvalue ${target} ${property})
Modified: sandbox/troy/boost_1_34_0/tools/build/CMake/testing/a/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/tools/build/CMake/testing/a/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/tools/build/CMake/testing/a/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
A
)
Modified: sandbox/troy/boost_1_34_0/tools/build/CMake/testing/b/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/tools/build/CMake/testing/b/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/tools/build/CMake/testing/b/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
B
)
Modified: sandbox/troy/boost_1_34_0/tools/build/CMake/testing/c/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/tools/build/CMake/testing/c/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/tools/build/CMake/testing/c/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
C
)
Modified: sandbox/troy/boost_1_34_0/tools/build/CMake/testing/d/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/tools/build/CMake/testing/d/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/tools/build/CMake/testing/d/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
D
)
Modified: sandbox/troy/boost_1_34_0/tools/build/CMake/testing/e/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/tools/build/CMake/testing/e/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/tools/build/CMake/testing/e/CMakeLists.txt 2007-05-20 09:24:39 EDT (Sun, 20 May 2007)
@@ -1,4 +1,4 @@
-boost_library_subproject(
+boost_library_project(
E
)
boost_library(boost_e lib.cpp)