diff options
| author | Shauren <shauren.trinity@gmail.com> | 2013-02-12 12:21:24 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2013-02-12 12:21:24 +0100 |
| commit | 1ff184dbab73492c3541a960bd720863a05c1cc2 (patch) | |
| tree | e9e14df2c2fc5c923e8ab9c7c56a0a3c967297b8 | |
| parent | dfa56a33e08de755fa85184436ac8d946e928ab6 (diff) | |
Buildsystem: Do not print warning that user needs to do a git pull with tags if configured to not use git at all
| -rw-r--r-- | cmake/genrev.cmake | 3 | ||||
| -rw-r--r-- | src/genrev/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cmake/genrev.cmake b/cmake/genrev.cmake index a2341b501af..35f1a7a11ed 100644 --- a/cmake/genrev.cmake +++ b/cmake/genrev.cmake @@ -13,11 +13,12 @@ if(NOT BUILDDIR) # Workaround for funny MSVC behaviour - this segment only run during compile + set(NO_GIT ${WITHOUT_GIT}) set(GIT_EXEC ${GIT_EXECUTABLE}) set(BUILDDIR ${CMAKE_BINARY_DIR}) endif() -if(WITHOUT_GIT) +if(NO_GIT) set(rev_date "1970-01-01 00:00:00 +0000") set(rev_hash "Archived") else() diff --git a/src/genrev/CMakeLists.txt b/src/genrev/CMakeLists.txt index d4486202b60..b54534af827 100644 --- a/src/genrev/CMakeLists.txt +++ b/src/genrev/CMakeLists.txt @@ -10,6 +10,6 @@ # Need to pass old ${CMAKE_BINARY_DIR} as param because its different at build stage add_custom_target(revision.h ALL - COMMAND ${CMAKE_COMMAND} -DGIT_EXEC=${GIT_EXECUTABLE} -DBUILDDIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/genrev.cmake + COMMAND ${CMAKE_COMMAND} -DNO_GIT=${WITHOUT_GIT} -DGIT_EXEC=${GIT_EXECUTABLE} -DBUILDDIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/genrev.cmake WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) |