diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-01-07 20:00:14 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-07 20:00:14 (GMT) |
| commit | b33c8b0a57d365f60605cd3a818c9e502491debe (patch) | |
| tree | 847bb1070a410a3db5c461946b8869ad24a57257 | |
| parent | f8c32f996cac5db890c29958989d25ada389772b (diff) | |
| parent | de30df322c5b8c01133a008822c691959ebf93a4 (diff) | |
| download | Doxygen-b33c8b0a57d365f60605cd3a818c9e502491debe.zip Doxygen-b33c8b0a57d365f60605cd3a818c9e502491debe.tar.gz Doxygen-b33c8b0a57d365f60605cd3a818c9e502491debe.tar.bz2 | |
Merge pull request #7487 from albert-github/feature/bug_clean_git
Correction behavior of make clean in respect to version files
| -rw-r--r-- | cmake/git_watcher.cmake | 1 | ||||
| -rw-r--r-- | libversion/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/cmake/git_watcher.cmake b/cmake/git_watcher.cmake index 6a50476..72b7852 100644 --- a/cmake/git_watcher.cmake +++ b/cmake/git_watcher.cmake @@ -178,6 +178,7 @@ function(SetupGitMonitoring) ALL DEPENDS ${PRE_CONFIGURE_GIT_VERSION_FILE} BYPRODUCTS ${POST_CONFIGURE_GIT_VERSION_FILE} + BYPRODUCTS ${GIT_STATE_FILE} COMMENT "Checking the git repository for changes..." COMMAND ${CMAKE_COMMAND} diff --git a/libversion/CMakeLists.txt b/libversion/CMakeLists.txt index 34e8655..6952cea 100644 --- a/libversion/CMakeLists.txt +++ b/libversion/CMakeLists.txt @@ -7,6 +7,7 @@ set(POST_CONFIGURE_DOXYGEN_VERSION_FILE "${GENERATED_SRC}/doxyversion.cpp") # setup information for git version handling set(PRE_CONFIGURE_GIT_VERSION_FILE "${CMAKE_SOURCE_DIR}/libversion/gitversion.cpp.in") set(POST_CONFIGURE_GIT_VERSION_FILE "${GENERATED_SRC}/gitversion.cpp") +set(GIT_STATE_FILE "${GENERATED_SRC}/git_state") include(${CMAKE_SOURCE_DIR}/cmake/git_watcher.cmake) include(${CMAKE_SOURCE_DIR}/cmake/doxygen_version.cmake) @@ -25,3 +26,4 @@ add_dependencies( doxygen_version check_doxygen_version ) set_source_files_properties(${POST_CONFIGURE_GIT_VERSION_FILE} PROPERTIES GENERATED 1) set_source_files_properties(${POST_CONFIGURE_DOXYGEN_VERSION_FILE} PROPERTIES GENERATED 1) +set_source_files_properties(${GIT_STATE_FILE} PROPERTIES GENERATED 1) |