From ce712adda2c14926bdba34afa14be452a271cd66 Mon Sep 17 00:00:00 2001 From: click Date: Fri, 8 Oct 2010 22:11:47 +0200 Subject: 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 --- src/CMakeLists.txt | 2 +- src/genrev/CMakeLists.txt | 16 ++++++++++++++++ src/revision.h/CMakeLists.txt | 15 --------------- 3 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 src/genrev/CMakeLists.txt delete mode 100644 src/revision.h/CMakeLists.txt (limited to 'src') 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/genrev/CMakeLists.txt b/src/genrev/CMakeLists.txt new file mode 100644 index 00000000000..bcc874fbd80 --- /dev/null +++ b/src/genrev/CMakeLists.txt @@ -0,0 +1,16 @@ +# Copyright (C) 2008-2010 Trinity +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# 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} +) diff --git a/src/revision.h/CMakeLists.txt b/src/revision.h/CMakeLists.txt deleted file mode 100644 index 316ed5b8580..00000000000 --- a/src/revision.h/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (C) 2008-2010 Trinity -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# Need to pass old ${CMAKE_BINARY_DIR} as param because its different at build stage -add_custom_target(revision.h ALL - COMMAND ${CMAKE_COMMAND} -DBUILDDIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/genrev.cmake - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -) -- cgit v1.2.3