From cdae489afa646aff9249b82ce88872dd6f192ec1 Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Fri, 31 May 2013 23:04:56 -0500 Subject: [PATCH] include only the boost headers in the scratch repo --- CMakeModules/download_boost.cmake | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/CMakeModules/download_boost.cmake b/CMakeModules/download_boost.cmake index 9c9148dc88..aa183b0282 100644 --- a/CMakeModules/download_boost.cmake +++ b/CMakeModules/download_boost.cmake @@ -31,6 +31,15 @@ set( BOOST_MD5 a00d22605d5dbcfb4c9936a9b35bc4c2 ) # re-calc this on every RELEAS string( REGEX REPLACE "\\." "_" BOOST_VERS "${BOOST_RELEASE}" ) set( PREFIX ${DOWNLOAD_DIR}/boost_${BOOST_VERS} ) +# = ${PREFIX}/src/boost +# There is a Bazaar 'boost scratch repo' in /boost and after committing pristine +# download, the patch is applied. This lets you regenerate a new patch at any time +# easily, simply by editing the working tree in and doing "bzr diff" in there. + +# include only the headers in the repo. +# repo = "${headers}/../.bzr" = "/.bzr" +set( headers ${PREFIX}/src/boost/boost ) + ExternalProject_Add( boost PREFIX ${PREFIX} @@ -45,17 +54,10 @@ ExternalProject_Add( boost # remove then re-copy into the include/boost directory during next two steps: BUILD_COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_SOURCE_DIR}/include/boost - INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory /boost ${PROJECT_SOURCE_DIR}/include/boost + INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${headers} ${PROJECT_SOURCE_DIR}/include/boost ) -# = ${PREFIX}/src/boost -# Add extra steps, so that we can easily regenerate any boost patch needed for the above. -# There is a Bazaar 'boost scratch repo' in and after committing pristine -# download, the patch is applied. This lets you regenerate a new patch at any time -# easily, simply by editing the working tree in and doing "bzr diff" in there. - - ExternalProject_Add_Step( boost bzr_commit_boost COMMAND bzr ci -q -m pristine COMMENT "committing pristine boost files to 'boost scratch repo'" @@ -64,7 +66,8 @@ ExternalProject_Add_Step( boost bzr_commit_boost ExternalProject_Add_Step( boost bzr_add_boost - COMMAND bzr add -q + # add only the headers to the scratch repo, repo = "../.bzr" from ${headers} + COMMAND bzr add -q ${headers} COMMENT "adding pristine boost files to 'boost scratch repo'" DEPENDERS bzr_commit_boost )