]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Bugfix: Avoid unnecessary reconfigurations of subprojects
authorMatthias Maier <tamiko@kyomu.43-1.org>
Sat, 26 Oct 2013 09:14:20 +0000 (09:14 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Sat, 26 Oct 2013 09:14:20 +0000 (09:14 +0000)
git-svn-id: https://svn.dealii.org/trunk@31431 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/config/CMakeLists.txt

index b2989230251c5bc867613477f907c05cf01125e0..4309152d48ed22ed71cabbf67230ab6720438918 100644 (file)
@@ -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
   )

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.