|
|
Boost-Commit : |
From: dgregor_at_[hidden]
Date: 2007-05-31 22:02:34
Author: dgregor
Date: 2007-05-31 22:02:33 EDT (Thu, 31 May 2007)
New Revision: 4412
URL: http://svn.boost.org/trac/boost/changeset/4412
Log:
Clean up some cruft from the CMake setup
Removed:
sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/testing/
Text files modified:
sandbox-branches/boost-cmake/boost_1_34_0/CMakeLists.txt | 10 ++--------
sandbox-branches/boost-cmake/boost_1_34_0/TODO | 3 +--
sandbox-branches/boost-cmake/boost_1_34_0/libs/thread/src/CMakeLists.txt | 1 -
sandbox-branches/boost-cmake/boost_1_34_0/libs/xpressive/test/CMakeLists.txt | 5 +++--
sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-core.cmake | 33 +--------------------------------
sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-testing.cmake | 38 +++++++++++---------------------------
6 files changed, 18 insertions(+), 72 deletions(-)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/CMakeLists.txt 2007-05-31 22:02:33 EDT (Thu, 31 May 2007)
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.4.4 FATAL_ERROR)
project(Boost)
@@ -82,10 +82,4 @@
include(CPack)
##########################################################################
-option(BOOST_SELFTEST "Build internal testing projects... not the boost libraries" OFF)
-# Subdirectories of Boost
-if (BOOST_SELFTEST)
- add_subdirectory(tools/build/CMake/testing)
-else (BOOST_SELFTEST)
- add_subdirectory(libs)
-endif(BOOST_SELFTEST)
\ No newline at end of file
+add_subdirectory(libs)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/TODO
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/TODO (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/TODO 2007-05-31 22:02:33 EDT (Thu, 31 May 2007)
@@ -32,11 +32,10 @@
- Testing for the Statechart library
-- Testing for the Thread library
-
- Testing for the TR1 library (globs for tests)
- Testing for the type traits library (globs for tests)
- Testing for the typeof library
+- Xpressive: port multipledefs and msvc-stlport tests
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/thread/src/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/thread/src/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/thread/src/CMakeLists.txt 2007-05-31 22:02:33 EDT (Thu, 31 May 2007)
@@ -4,6 +4,5 @@
thread.cpp tss_hooks.cpp tss_dll.cpp tss_pe.cpp tss.cpp xtime.cpp
SHARED_COMPILE_FLAGS "-DBOOST_THREAD_BUILD_DLL=1"
STATIC_COMPILE_FLAGS "-DBOOST_THREAD_BUILD_LIB=1"
- SHARED_COMPILE_REQUIREMENTS "-DBOOST_THREAD_BUILD_DLL=1"
)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/xpressive/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/xpressive/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/xpressive/test/CMakeLists.txt 2007-05-31 22:02:33 EDT (Thu, 31 May 2007)
@@ -4,8 +4,9 @@
# [ linkp multiple_defs1.cpp multiple_defs2.cpp : : multiple_defs ]
-boost_test_fail("multipledefs")
-boost_test_fail("msvc-stlport")
+# TODO: Fix these
+# boost_test_fail("multipledefs")
+# boost_test_fail("msvc-stlport")
if (NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/libs/date_time/data")
Modified: sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-core.cmake
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-core.cmake (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-core.cmake 2007-05-31 22:02:33 EDT (Thu, 31 May 2007)
@@ -199,27 +199,9 @@
set_target_properties(${target} PROPERTIES ${property} "${oldvalue} ${pushvalue}")
endmacro(push_back_target_property target property pushvalue)
-macro(propagate_property)
- trace("args:" ${ARGN})
- parse_arguments(_
- "FROM_TARGET;TO_TARGET;FROM_PROPNAME;TO_PROPNAME"
- ""
- ${ARGN}
- )
- trace("propagate ${__FROM_TARGET}:${__FROM_PROPNAME} -> ${__TO_TARGET}:${__TO_PROPNAME} [${props_}]")
- assert(__FROM_TARGET)
- assert(__FROM_PROPNAME)
- assert(__TO_TARGET)
- get_target_property(props_ ${__FROM_TARGET} ${__FROM_PROPNAME})
- trace("::: ${props_}")
- if (props_)
- push_back_target_property(${__TO_TARGET} ${__TO_PROPNAME} ${props_})
- endif(props_)
-endmacro(propagate_property)
-
macro(boost_library)
parse_arguments(THIS_LIB
- "DEPENDS;LIBRARIES;STATIC_COMPILE_FLAGS;STATIC_COMPILE_REQUIREMENTS;SHARED_COMPILE_FLAGS;SHARED_COMPILE_REQUIREMENTS"
+ "DEPENDS;LIBRARIES;STATIC_COMPILE_FLAGS;SHARED_COMPILE_FLAGS"
"NO_STATIC;NO_SHARED;STATIC_TAG"
${ARGN}
)
@@ -255,19 +237,12 @@
RELWITHDEBINFO_OUTPUT_NAME "${libname}${BOOST_LIBRARY_VERSION_STRING_DEBUG}${THIS_LIB_STATIC_TAG}"
CLEAN_DIRECT_OUTPUT 1
COMPILE_FLAGS "${THIS_LIB_STATIC_COMPILE_FLAGS}"
- COMPILE_REQUIREMENTS "${THIS_LIB_STATIC_COMPILE_REQUIREMENTS}"
)
add_dependencies(${libname} "${libname}-static")
-# trace("sticky statics(${libname}): ${THIS_LIB_STICKY_STATIC_COMPILE_FLAGS}")
target_link_libraries("${libname}-static" ${THIS_LIB_LIBRARIES})
foreach(dependency ${THIS_LIB_DEPENDS})
target_link_libraries("${libname}-static" "${dependency}-static")
- propagate_property(FROM_TARGET "${dependency}-static"
- FROM_PROPNAME COMPILE_REQUIREMENTS
- TO_TARGET ${libname}-static
- TO_PROPNAME COMPILE_FLAGS
- )
endforeach(dependency "${THIS_LIB_DEPENDS}")
install(TARGETS "${libname}-static" DESTINATION lib)
@@ -282,18 +257,12 @@
RELWITHDEBINFO_OUTPUT_NAME "${libname}${BOOST_LIBRARY_VERSION_STRING_DEBUG}"
CLEAN_DIRECT_OUTPUT 1
COMPILE_FLAGS "${THIS_LIB_SHARED_COMPILE_FLAGS}"
- COMPILE_REQUIREMENTS "${THIS_LIB_SHARED_COMPILE_REQUIREMENTS}"
SOVERSION "${BOOST_VERSION}"
)
add_dependencies(${libname} "${libname}-shared")
target_link_libraries("${libname}-shared" ${THIS_LIB_LIBRARIES})
foreach(dependency ${THIS_LIB_DEPENDS})
target_link_libraries("${libname}-shared" "${dependency}-shared")
- propagate_property(FROM_TARGET "${dependency}-shared"
- FROM_PROPNAME COMPILE_REQUIREMENTS
- TO_TARGET ${libname}-shared
- TO_PROPNAME COMPILE_FLAGS
- )
endforeach(dependency ${THIS_LIB_DEPENDS})
install(TARGETS "${libname}-shared" DESTINATION lib)
endif(NOT "${THIS_LIB_NO_SHARED}" STREQUAL "TRUE")
Modified: sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-testing.cmake
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-testing.cmake (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-testing.cmake 2007-05-31 22:02:33 EDT (Thu, 31 May 2007)
@@ -28,13 +28,11 @@
#
# boost_test_compile_fail: Tests that the given source file produces
# errors when compiled.
-
#
-# these macros format the displayed name of the test as PROJECT_NAME::testname
-# where PROJECT_NAME is a global set by the cmake PROJECT macro
-# inside boost_library_subproject. this use of a global (hrm) is standard practice
-# in cmakeland but we might not like this...
#
+# These macros format the displayed name of the test as
+# PROJECT_NAME::testname, where PROJECT_NAME is a global set by the
+# CMake PROJECT macro inside boost_library_project.
option(BUILD_TESTING "Enable testing" OFF)
include(CTest)
@@ -50,8 +48,8 @@
# Categorize each of the arguments
foreach(ARG ${BOOST_TEST_DEPENDS})
# If building static libraries is turned off..
- GET_TARGET_PROPERTY(DEPEND_TYPE ${ARG} TYPE)
- GET_TARGET_PROPERTY(DEPEND_LOCATION ${ARG} LOCATION)
+ get_target_property(DEPEND_TYPE ${ARG} TYPE)
+ get_target_property(DEPEND_LOCATION ${ARG} LOCATION)
if (NOT BUILD_STATIC_LIBS AND ${DEPEND_TYPE} STREQUAL "STATIC_LIBRARY")
set(BOOST_TEST_OKAY FALSE)
endif (NOT BUILD_STATIC_LIBS AND ${DEPEND_TYPE} STREQUAL "STATIC_LIBRARY")
@@ -71,8 +69,6 @@
endif(NOT BUILD_TESTING)
endmacro(boost_test_parse_args)
-
-
macro(boost_test_run testname)
boost_test_parse_args(${testname} ${ARGN})
if (BOOST_TEST_OKAY)
@@ -83,20 +79,11 @@
OUTPUT_NAME ${PROJECT_NAME}/${testname})
target_link_libraries(${testname} ${BOOST_TEST_DEPENDS})
target_link_libraries(${testname} ${BOOST_TEST_LIBRARIES})
- foreach(_depend ${BOOST_TEST_DEPENDS})
- trace("propagate from ${BOOST_TEST_DEPENDS}")
- propagate_property(FROM_TARGET ${_depend}
- FROM_PROPNAME COMPILE_REQUIREMENTS
- TO_TARGET ${testname}
- TO_PROPNAME COMPILE_FLAGS
- )
- endforeach(_depend ${BOOST_TEST_DEPENDS})
- add_test("${PROJECT_NAME}::${testname}" ${EXECUTABLE_OUTPUT_PATH}/${PROJECT_NAME}/${testname} ${BOOST_TEST_ARGS})
+ add_test("${PROJECT_NAME}::${testname}"
+ ${EXECUTABLE_OUTPUT_PATH}/${PROJECT_NAME}/${testname} ${BOOST_TEST_ARGS})
endif(BOOST_TEST_OKAY)
endmacro(boost_test_run)
-
-
macro(boost_test_run_fail testname)
boost_test_parse_args(${testname} ${ARGN})
if(BOOST_TEST_OKAY)
@@ -107,16 +94,13 @@
OUTPUT_NAME ${PROJECT_NAME}/${testname})
target_link_libraries(${testname} ${BOOST_TEST_DEPENDS})
target_link_libraries(${testname} ${BOOST_TEST_LIBRARIES})
-
- add_test("${PROJECT_NAME}::${testname}" ${EXECUTABLE_OUTPUT_PATH}/${PROJECT_NAME}/${testname} ${BOOST_TEST_ARGS})
- set_tests_properties("${PROJECT_NAME}::${testname}" PROPERTIES WILL_FAIL TRUE)
+ add_test("${PROJECT_NAME}::${testname}"
+ ${EXECUTABLE_OUTPUT_PATH}/${PROJECT_NAME}/${testname} ${BOOST_TEST_ARGS})
+ set_tests_properties("${PROJECT_NAME}::${testname}"
+ PROPERTIES WILL_FAIL TRUE)
endif(BOOST_TEST_OKAY)
endmacro(boost_test_run_fail)
-macro(boost_test_fail testname)
- add_test("${PROJECT_NAME}::${testname}" false)
-endmacro(boost_test_fail)
-
macro(boost_test_compile testname)
boost_test_parse_args(${testname} ${ARGN})
if(BOOST_TEST_OKAY)
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk