diff options
| -rw-r--r-- | CMakeLists.txt | 16 | ||||
| -rw-r--r-- | click-finder.c | 4 | ||||
| -rw-r--r-- | click-finder.h.in | 3 | ||||
| -rw-r--r-- | version.cmake | 4 | ||||
| -rw-r--r-- | version.h.in | 1 |
5 files changed, 14 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b7a1a6..5250a02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 2.8) project (click-finder) -#find_package (Git) +find_package (Git) set (click_finder_VERSION_MAJOR 1) set (click_finder_VERSION_MINOR 0) configure_file ( @@ -9,10 +9,10 @@ configure_file ( ) include_directories("${PROJECT_BINARY_DIR}") add_executable(click-finder click-finder.c) -#ADD_CUSTOM_TARGET( -# version -# ${CMAKE_COMMAND} -D SRC=${PROJECT_SOURCE_DIR}/version.h.in -# -D DST=${PROJECT_BINARY_DIR}/version.h -# -P ${PROJECT_SOURCE_DIR}/version.cmake -#) -#ADD_DEPENDENCIES(click-finder version) +ADD_CUSTOM_TARGET( + version + ${CMAKE_COMMAND} -D SRC=${PROJECT_SOURCE_DIR}/version.h.in + -D DST=${PROJECT_BINARY_DIR}/version.h + -P ${PROJECT_SOURCE_DIR}/version.cmake +) +ADD_DEPENDENCIES(click-finder version) diff --git a/click-finder.c b/click-finder.c index 118f0f6..a30a2e1 100644 --- a/click-finder.c +++ b/click-finder.c @@ -1,9 +1,9 @@ #include <stdio.h> #include <stdlib.h> #include "click-finder.h" - +#include "version.h" int main(int argc, char** argv) { - printf("%d.%d\n", click_finder_VERSION_MAJOR, click_finder_VERSION_MINOR); + printf("%s\n", VERSION); return 0; } diff --git a/click-finder.h.in b/click-finder.h.in index 0305af7..8b13789 100644 --- a/click-finder.h.in +++ b/click-finder.h.in @@ -1,2 +1 @@ -#define click_finder_VERSION_MAJOR @click_finder_VERSION_MAJOR@ -#define click_finder_VERSION_MINOR @click_finder_VERSION_MINOR@ + diff --git a/version.cmake b/version.cmake index 9aa2637..333cdd7 100644 --- a/version.cmake +++ b/version.cmake @@ -1,6 +1,6 @@ EXECUTE_PROCESS( - COMMAND ${GIT_EXECUTABLE} --version + COMMAND git rev-parse HEAD OUTPUT_VARIABLE VERSION OUTPUT_STRIP_TRAILING_WHITESPACE ) - CONFIGURE_FILE(\${SRC} \${DST} @ONLY) +CONFIGURE_FILE(${SRC} ${DST} @ONLY) diff --git a/version.h.in b/version.h.in new file mode 100644 index 0000000..a44b122 --- /dev/null +++ b/version.h.in @@ -0,0 +1 @@ +#define VERSION "@VERSION@" |