diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-12-17 16:34:39 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-12-17 17:06:23 -0800 |
| commit | dd1c1359a132a9f6a2c3ffc992d5a1fe47cb0055 (patch) | |
| tree | 8fb0abc331ce8f01d84a75380af1e8c83fae8197 /cmake/Modules | |
| parent | c7278cd9ed2450d9137cd432f77a135a3730dec4 (diff) | |
| download | subsurface-dd1c1359a132a9f6a2c3ffc992d5a1fe47cb0055.tar.gz | |
Cmake: successfully create the subsurface.nsi file
More issues with the static cmake files. Again we were missing a variable
and needed less quoting. Additionally there was dead / redundant code.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/HandleVersionGeneration.cmake | 3 | ||||
| -rw-r--r-- | cmake/Modules/version.cmake | 10 |
2 files changed, 4 insertions, 9 deletions
diff --git a/cmake/Modules/HandleVersionGeneration.cmake b/cmake/Modules/HandleVersionGeneration.cmake index b01d532ee..beb4e49a2 100644 --- a/cmake/Modules/HandleVersionGeneration.cmake +++ b/cmake/Modules/HandleVersionGeneration.cmake @@ -9,10 +9,11 @@ file(COPY cmake/Modules/version.cmake DESTINATION ${CMAKE_BINARY_DIR}) add_custom_target( - version ALL COMMAND ${CMAKE_COMMAND} ${CMAKE_COMMAND} + version ALL COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_BINARY_DIR}/version.h.in -D DST=${CMAKE_BINARY_DIR}/ssrf-version.h -D CMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME} -D CMAKE_TOP_SRC_DIR=${CMAKE_SOURCE_DIR} + -D CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_BINARY_DIR}/version.cmake ) diff --git a/cmake/Modules/version.cmake b/cmake/Modules/version.cmake index a041ed1fa..decb7c568 100644 --- a/cmake/Modules/version.cmake +++ b/cmake/Modules/version.cmake @@ -10,12 +10,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") set(VER_OS win) endif() execute_process( - COMMAND sh ${CMAKE_TOP_SRC_DIR}/scripts/get-version ${VER_OS} - WORKING_DIRECTORY ${CMAKE_TOP_SRC_DIR} - OUTPUT_VARIABLE VERSION_STRING - OUTPUT_STRIP_TRAILING_WHITESPACE -) -execute_process( COMMAND sh ${CMAKE_TOP_SRC_DIR}/scripts/get-version linux WORKING_DIRECTORY ${CMAKE_TOP_SRC_DIR} OUTPUT_VARIABLE GIT_VERSION_STRING @@ -32,8 +26,8 @@ configure_file(${SRC} ${DST} @ONLY) if(CMAKE_SYSTEM_NAME STREQUAL "Windows") execute_process( COMMAND cat ${CMAKE_TOP_SRC_DIR}/packaging/windows/subsurface.nsi.in - COMMAND sed -e \"s/VERSIONTOKEN/\${GIT_VERSION_STRING}/\" - COMMAND sed -e \"s/PRODVTOKEN/\${CANONICAL_VERSION_STRING}/\" + COMMAND sed -e "s/VERSIONTOKEN/${GIT_VERSION_STRING}/" + COMMAND sed -e "s/PRODVTOKEN/${CANONICAL_VERSION_STRING}/" OUTPUT_FILE ${CMAKE_BINARY_DIR}/staging/subsurface.nsi ) endif() |