aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorclick <none@none>2010-10-08 22:11:47 +0200
committerclick <none@none>2010-10-08 22:11:47 +0200
commitce712adda2c14926bdba34afa14be452a271cd66 (patch)
tree26f6d9eaee91faecdc27f8b71af935d60be8d4d4
parent1760e42e2caa99d3de0038d1b52f64a1daeb665a (diff)
Buildsystem: Clean up the revision.h target generation
- rename src/revision.h folder to src/genrev - ensure BUILDDIR/revision.h file is cleared/removed before generation (deleted/recreated during buildmode-changes) Note: This needs further testing, so please give feedback. --HG-- branch : trunk rename : src/revision.h/CMakeLists.txt => src/genrev/CMakeLists.txt
-rw-r--r--cmake/genrev.cmake1
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/genrev/CMakeLists.txt (renamed from src/revision.h/CMakeLists.txt)1
3 files changed, 2 insertions, 2 deletions
diff --git a/cmake/genrev.cmake b/cmake/genrev.cmake
index 860e6d98709..9fe49139717 100644
--- a/cmake/genrev.cmake
+++ b/cmake/genrev.cmake
@@ -67,4 +67,3 @@ configure_file(
"${BUILDDIR}/revision.h"
@ONLY
)
-message(STATUS "Created revision.h")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cf92eb79753..af7eb9fa325 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,7 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-add_subdirectory(revision.h)
+add_subdirectory(genrev)
add_subdirectory(server)
if(TOOLS)
diff --git a/src/revision.h/CMakeLists.txt b/src/genrev/CMakeLists.txt
index 316ed5b8580..bcc874fbd80 100644
--- a/src/revision.h/CMakeLists.txt
+++ b/src/genrev/CMakeLists.txt
@@ -10,6 +10,7 @@
# Need to pass old ${CMAKE_BINARY_DIR} as param because its different at build stage
add_custom_target(revision.h ALL
+ COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/revision.h
COMMAND ${CMAKE_COMMAND} -DBUILDDIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/genrev.cmake
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)