[Boost-commit] svn:boost r4114

From: troy_at_[hidden]
Date: 2007-05-18 07:20:12

Author: troy
Date: 2007-05-18 07:20:11 EDT (Fri, 18 May 2007)
New Revision: 4114
URL: http://svn.boost.org/trac/boost/changeset/4114

Log:
Rename BUILD_BOOST_* to DISABLE_BOOST_* and fix out of date comments.

Text files modified: 
   sandbox/troy/boost_1_34_0/tools/build/CMake/boost-core.cmake |    40 +++++++++++++++++++++-------------------
   1 files changed, 21 insertions(+), 19 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-18 07:20:11 EDT (Fri, 18 May 2007)
@@ -120,25 +120,27 @@
     ${ARGN}
     )
 
-  # TDS: I think this should be done with toplevel targets as this
-  # gets you dependency checking, etc...
-  string(TOUPPER "BUILD_BOOST_${libname_}" BOOST_LIB_OPTION_NAME)
-  option(${BOOST_LIB_OPTION_NAME} "Build Boost.${libname_}" ON)
-
-  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})
-
-  # currently src and testdirs are irrelevant.  At one point it seemed
-  # 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})
-    add_subdirectory(${SUBDIR})
-  endforeach(SUBDIR ${THIS_SUBPROJECT_SRCDIRS} ${THIS_SUBPROJECT_TESTDIRS})
+  string(TOUPPER "DISABLE_BOOST_${libname_}" BOOST_DISABLE_LIB_OPTION)
+  option(${BOOST_DISABLE_LIB_OPTION} 
+    " Disable build of Boost.${libname_} (prefer make targets, not this, to build individual libs)" 
+    OFF)
+  if(NOT ${BOOST_DISABLE_LIB_OPTION})
+
+    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})
+
+    # currently src and testdirs are irrelevant.  At one point it seemed
+    # 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})
+      add_subdirectory(${SUBDIR})
+    endforeach(SUBDIR ${THIS_SUBPROJECT_SRCDIRS} ${THIS_SUBPROJECT_TESTDIRS})
+  endif(NOT ${BOOST_DISABLE_LIB_OPTION})
 endmacro(boost_library_subproject)
 
 macro(push_back_target_property target property pushvalue)