[Boost-commit] svn:boost r46970 - branches/CMake/release/tools/build/CMake

From: troy_at_[hidden]
Date: 2008-07-01 13:00:35

Author: troy
Date: 2008-07-01 13:00:35 EDT (Tue, 01 Jul 2008)
New Revision: 46970
URL: http://svn.boost.org/trac/boost/changeset/46970

Log:
use 'monolithic' external as source for header modularization
Text files modified: 
   branches/CMake/release/tools/build/CMake/BoostCore.cmake |    12 +++++++++---                            
   1 files changed, 9 insertions(+), 3 deletions(-)

Modified: branches/CMake/release/tools/build/CMake/BoostCore.cmake
==============================================================================
--- branches/CMake/release/tools/build/CMake/BoostCore.cmake	(original)
+++ branches/CMake/release/tools/build/CMake/BoostCore.cmake	2008-07-01 13:00:35 EDT (Tue, 01 Jul 2008)
@@ -207,17 +207,23 @@
         ${ULIBNAME})
     endif (THIS_PROJECT_MODULAR)
 
-    if(THIS_PROJECT_HEADERS)
+    if(THIS_PROJECT_HEADERS AND THIS_PROJECT_MODULAR)
       add_custom_target(${LIBNAME}-modularize
         COMMAND mkdir -p ${Boost_SOURCE_DIR}/libs/${libname}/include/boost
         COMMAND rsync -va --exclude=".svn" --delete ${THIS_PROJECT_HEADERS} ${Boost_SOURCE_DIR}/libs/${libname}/include/boost/
         # Uncomment this to see how clean your toplevel boost/ dir is afterwards
         # COMMAND rm -rf ${THIS_PROJECT_HEADERS}
+	WORKING_DIRECTORY ${Boost_SOURCE_DIR}/monolithic
+	COMMENT "Rsyncing ${THIS_PROJECT_HEADERS} to project include dir from monolithic dir"
+	)
+      add_custom_command(TARGET ${LIBNAME}-modularize
+	POST_BUILD
+	COMMAND rm -rf ${THIS_PROJECT_HEADERS}
         WORKING_DIRECTORY ${Boost_SOURCE_DIR}/boost
-	COMMENT "Rsyncing ${THIS_PROJECT_HEADERS} to project include dir"
+	COMMENT "Cleaning headers from ${LIBNAME} from toplevel boost dir"
         )
       add_dependencies(modularize ${LIBNAME}-modularize)
-    endif(THIS_PROJECT_HEADERS)
+    endif(THIS_PROJECT_HEADERS AND THIS_PROJECT_MODULAR)
 
     if(THIS_PROJECT_SRCDIRS)
       # Add an installation target for the sources of this library.