From 2b7ebb55dddbff4561863afde5892d8ad76738e1 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sat, 26 Oct 2013 09:14:20 +0000 Subject: [PATCH] Bugfix: Avoid unnecessary reconfigurations of subprojects git-svn-id: https://svn.dealii.org/trunk@31431 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/config/CMakeLists.txt | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/deal.II/cmake/config/CMakeLists.txt b/deal.II/cmake/config/CMakeLists.txt index b298923025..4309152d48 100644 --- a/deal.II/cmake/config/CMakeLists.txt +++ b/deal.II/cmake/config/CMakeLists.txt @@ -306,20 +306,7 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) ) ENDIF() -# -# Finally, add a target to create the "binary" file in -# ${DEAL_II_PROJECT_CONFIG_RELDIR} and add it to the "all" target: -# -ADD_CUSTOM_TARGET(setup_build_dir ALL - COMMAND ${CMAKE_COMMAND} -E touch - ${CMAKE_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_RELDIR}/binary - COMMAND ${CMAKE_COMMAND} -E touch - ${CMAKE_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_RELDIR}/${DEAL_II_PROJECT_CONFIG_NAME}Config.cmake - COMMENT "Update build directory" - ) -FOREACH(_build ${DEAL_II_BUILD_TYPES}) - ADD_DEPENDENCIES(setup_build_dir ${DEAL_II_BASE_NAME}${DEAL_II_${_build}_SUFFIX}) -ENDFOREACH() +FILE(WRITE ${CMAKE_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_RELDIR}/binary "") # # And a script to remove it upon installation from the install prefix: @@ -327,11 +314,6 @@ ENDFOREACH() # (yes this is a valid use case...). # INSTALL(CODE - " - FILE(REMOVE ${CMAKE_INSTALL_PREFIX}/${DEAL_II_PROJECT_CONFIG_RELDIR}/binary) - EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E touch - ${CMAKE_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_RELDIR}/${DEAL_II_PROJECT_CONFIG_NAME}Config.cmake - ) - " + "FILE(REMOVE ${CMAKE_INSTALL_PREFIX}/${DEAL_II_PROJECT_CONFIG_RELDIR}/binary)" COMPONENT library ) -- 2.39.5