diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-12-16 15:48:31 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-12-16 15:48:31 -0800 |
| commit | 4e69ff54b0b795fb17630ef678c84c656910062d (patch) | |
| tree | 06c26fcde6013435c5c04b6b3d913b7f001ad036 /cmake | |
| parent | d4184f852d9d4fedec84273f8fccf7745053e9b1 (diff) | |
| download | subsurface-4e69ff54b0b795fb17630ef678c84c656910062d.tar.gz | |
Cmake: fix version generation
In the cmake module we no longer had a way to get back to the main scripts
directory.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/HandleVersionGeneration.cmake | 1 | ||||
| -rw-r--r-- | cmake/Modules/version.cmake | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/cmake/Modules/HandleVersionGeneration.cmake b/cmake/Modules/HandleVersionGeneration.cmake index 801140462..b01d532ee 100644 --- a/cmake/Modules/HandleVersionGeneration.cmake +++ b/cmake/Modules/HandleVersionGeneration.cmake @@ -13,5 +13,6 @@ add_custom_target( -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} -P ${CMAKE_BINARY_DIR}/version.cmake ) diff --git a/cmake/Modules/version.cmake b/cmake/Modules/version.cmake index bd42e3e73..a041ed1fa 100644 --- a/cmake/Modules/version.cmake +++ b/cmake/Modules/version.cmake @@ -10,20 +10,20 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") set(VER_OS win) endif() execute_process( - COMMAND sh scripts/get-version ${VER_OS} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + 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 scripts/get-version linux - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMAND sh ${CMAKE_TOP_SRC_DIR}/scripts/get-version linux + WORKING_DIRECTORY ${CMAKE_TOP_SRC_DIR} OUTPUT_VARIABLE GIT_VERSION_STRING OUTPUT_STRIP_TRAILING_WHITESPACE ) execute_process( - COMMAND sh scripts/get-version full - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMAND sh ${CMAKE_TOP_SRC_DIR}/scripts/get-version full + WORKING_DIRECTORY ${CMAKE_TOP_SRC_DIR} OUTPUT_VARIABLE CANONICAL_VERSION_STRING OUTPUT_STRIP_TRAILING_WHITESPACE ) @@ -31,7 +31,7 @@ execute_process( configure_file(${SRC} ${DST} @ONLY) if(CMAKE_SYSTEM_NAME STREQUAL "Windows") execute_process( - COMMAND cat ${CMAKE_SOURCE_DIR}/packaging/windows/subsurface.nsi.in + 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}/\" OUTPUT_FILE ${CMAKE_BINARY_DIR}/staging/subsurface.nsi |