[Boost-commit] svn:boost r4105

From: troy_at_[hidden]
Date: 2007-05-17 19:46:21

Author: troy
Date: 2007-05-17 19:46:20 EDT (Thu, 17 May 2007)
New Revision: 4105
URL: http://svn.boost.org/trac/boost/changeset/4105

Log:
TOLOWER library names (Algorithm and Date_time look inconsistent.
Maybe it they aren't?  Just say so.)

remove cruft inside IF(0)

put test binaries in to CMAKE_BINARY_DIR/bin/PROJECT/ instead of the
toplevel bin/ to avoid collisions.  

Text files modified: 
   sandbox/troy/boost_1_34_0/tools/build/CMake/boost-core.cmake    |    23 ++++++++---------------                 
   sandbox/troy/boost_1_34_0/tools/build/CMake/boost-testing.cmake |     3 +++                                     
   2 files changed, 11 insertions(+), 15 deletions(-)

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-17 19:46:20 EDT (Thu, 17 May 2007)
@@ -12,20 +12,7 @@
   set(${varname} ${${varname}} ${ARGN})
 endmacro(append varname)
 
-IF(0)
-macro(set_usage_requirements target)
-  parse_arguments(USAGE_REQS
-    "STATIC;SHARED"
-    ""
-    ${ARGN}
-    )
-  set_target_properties(target 
-    PROPERTIES
-    STATIC_USAGE_REQS "${USAGE_REQS_STATIC}"
-    SHARED_USAGE_REQS "${USAGE_REQS_SHARED}"
-    )
-endmacro(set_usage_requirements target)
-ENDIF(0)
+
 # Defines a Boost library subproject (e.g., for Boost.Python). Use as:
 #
 #   boost_library_subproject(libname, subdir1, subdir2, ...)
@@ -39,13 +26,19 @@
 # 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)
+macro(boost_library_subproject libname_)
   parse_arguments(THIS_SUBPROJECT
     "SRCDIRS;TESTDIRS"
     ""
     ${ARGN}
     )
+  STRING(TOLOWER "${libname_}" libname)
   project(${libname})
+
+  IF(NOT EXISTS ${CMAKE_BINARY_DIR}/bin/${PROJECT_NAME})
+    FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/${PROJECT_NAME})
+  ENDIF(NOT EXISTS ${CMAKE_BINARY_DIR}/bin/${PROJECT_NAME})
+
   string(TOUPPER "BUILD_BOOST_${libname}" BOOST_LIB_OPTION_NAME)
   # currently src and testdirs are irrelevant.  At one point it seemed
   # that they would need to be kept separate and scanned in order

Modified: sandbox/troy/boost_1_34_0/tools/build/CMake/boost-testing.cmake
==============================================================================
--- sandbox/troy/boost_1_34_0/tools/build/CMake/boost-testing.cmake	(original)
+++ sandbox/troy/boost_1_34_0/tools/build/CMake/boost-testing.cmake	2007-05-17 19:46:20 EDT (Thu, 17 May 2007)
@@ -75,6 +75,9 @@
   boost_test_parse_args(${testname} ${ARGN})
   if (BOOST_TEST_OKAY)
     add_executable(${testname} ${BOOST_TEST_SOURCES})
+    set_target_properties(${testname}
+      PROPERTIES
+      OUTPUT_NAME ${PROJECT_NAME}/${testname})
     set_source_files_properties(${BOOST_TEST_SOURCES}
       COMPILE_FLAGS "${BOOST_TEST_COMPILE_FLAGS}"
       )