summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2013-03-05 08:02:51 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2013-03-05 08:02:51 +0100
commit5c859a2408506c53f1b3a17bdc867a649f5bf933 (patch)
tree2a7e4dba75ba5ef8a4dc7ffc1127e5fc9ba1e36f
parent80b7cbe9d92752d5d5db986cb8cf5b0c25242ddb (diff)
downloadfastd-5c859a2408506c53f1b3a17bdc867a649f5bf933.tar
fastd-5c859a2408506c53f1b3a17bdc867a649f5bf933.zip
Simplify git-describe call and make it more robust
-rw-r--r--src/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c201c6d..8f6c62e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -40,7 +40,7 @@ add_custom_target(
version
COMMAND echo "#ifndef _FASTD_VERSION_H_" > ${CMAKE_CURRENT_BINARY_DIR}/version.h.new
COMMAND echo "#define _FASTD_VERSION_H_" >> ${CMAKE_CURRENT_BINARY_DIR}/version.h.new
- COMMAND sh -c "echo \"#define FASTD_VERSION \\\"\$(git --git-dir=\"${FASTD_SOURCE_DIR}/.git\" --work-tree=\"${FASTD_SOURCE_DIR}\" describe --dirty 2>/dev/null || echo ${FASTD_VERSION})\\\"\"" >> ${CMAKE_CURRENT_BINARY_DIR}/version.h.new
+ COMMAND sh -c "echo \"#define FASTD_VERSION \\\"$(git --git-dir=./.git describe --dirty 2>/dev/null || echo ${FASTD_VERSION})\\\"\"" >> ${CMAKE_CURRENT_BINARY_DIR}/version.h.new
COMMAND echo "#endif /* _FASTD_VERSION_H_ */" >> ${CMAKE_CURRENT_BINARY_DIR}/version.h.new
COMMAND cmp -s ${CMAKE_CURRENT_BINARY_DIR}/version.h.new ${CMAKE_CURRENT_BINARY_DIR}/version.h && rm ${CMAKE_CURRENT_BINARY_DIR}/version.h.new || mv ${CMAKE_CURRENT_BINARY_DIR}/version.h.new ${CMAKE_CURRENT_BINARY_DIR}/version.h
WORKING_DIRECTORY "${FASTD_SOURCE_DIR}"