Skip to content

Commit de30df3

Browse files
committed
Correction behavior of make clean in respect to version files
I case we ran `make clean` it was not possible anymore to generate doxygen as the generated file `generated_src/gitversion.cpp` was not present any more and it was not re-generated. The generation of the `generated_src/gitversion.cpp` depends on teh `generated_src/git_state` file and this file was still present. This has been corrected.
1 parent d6ab8a1 commit de30df3

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

cmake/git_watcher.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ function(SetupGitMonitoring)
178178
ALL
179179
DEPENDS ${PRE_CONFIGURE_GIT_VERSION_FILE}
180180
BYPRODUCTS ${POST_CONFIGURE_GIT_VERSION_FILE}
181+
BYPRODUCTS ${GIT_STATE_FILE}
181182
COMMENT "Checking the git repository for changes..."
182183
COMMAND
183184
${CMAKE_COMMAND}

libversion/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set(POST_CONFIGURE_DOXYGEN_VERSION_FILE "${GENERATED_SRC}/doxyversion.cpp")
77
# setup information for git version handling
88
set(PRE_CONFIGURE_GIT_VERSION_FILE "${CMAKE_SOURCE_DIR}/libversion/gitversion.cpp.in")
99
set(POST_CONFIGURE_GIT_VERSION_FILE "${GENERATED_SRC}/gitversion.cpp")
10+
set(GIT_STATE_FILE "${GENERATED_SRC}/git_state")
1011

1112
include(${CMAKE_SOURCE_DIR}/cmake/git_watcher.cmake)
1213
include(${CMAKE_SOURCE_DIR}/cmake/doxygen_version.cmake)
@@ -25,3 +26,4 @@ add_dependencies( doxygen_version check_doxygen_version )
2526

2627
set_source_files_properties(${POST_CONFIGURE_GIT_VERSION_FILE} PROPERTIES GENERATED 1)
2728
set_source_files_properties(${POST_CONFIGURE_DOXYGEN_VERSION_FILE} PROPERTIES GENERATED 1)
29+
set_source_files_properties(${GIT_STATE_FILE} PROPERTIES GENERATED 1)

0 commit comments

Comments
 (0)