mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cmake: fix version generation

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2015-12-16 15:48:31 -08:00
parent d4184f852d
commit 4e69ff54b0
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmake/Modules/HandleVersionGeneration.cmake
View file

@ -13,5 +13,6 @@ add_custom_target(
-D SRC=${CMAKE_BINARY_DIR}/version.h.in -D SRC=${CMAKE_BINARY_DIR}/version.h.in
-D DST=${CMAKE_BINARY_DIR}/ssrf-version.h -D DST=${CMAKE_BINARY_DIR}/ssrf-version.h
-D CMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME} -D CMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
-D CMAKE_TOP_SRC_DIR=${CMAKE_SOURCE_DIR}
-P ${CMAKE_BINARY_DIR}/version.cmake -P ${CMAKE_BINARY_DIR}/version.cmake
) )

14
cmake/Modules/version.cmake
View file

@ -10,20 +10,20 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
set(VER_OS win) set(VER_OS win)
endif() endif()
execute_process( execute_process(
COMMAND sh scripts/get-version ${VER_OS} COMMAND sh ${CMAKE_TOP_SRC_DIR}/scripts/get-version ${VER_OS}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_TOP_SRC_DIR}
OUTPUT_VARIABLE VERSION_STRING OUTPUT_VARIABLE VERSION_STRING
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
execute_process( execute_process(
COMMAND sh scripts/get-version linux COMMAND sh ${CMAKE_TOP_SRC_DIR}/scripts/get-version linux
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_TOP_SRC_DIR}
OUTPUT_VARIABLE GIT_VERSION_STRING OUTPUT_VARIABLE GIT_VERSION_STRING
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
execute_process( execute_process(
COMMAND sh scripts/get-version full COMMAND sh ${CMAKE_TOP_SRC_DIR}/scripts/get-version full
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_TOP_SRC_DIR}
OUTPUT_VARIABLE CANONICAL_VERSION_STRING OUTPUT_VARIABLE CANONICAL_VERSION_STRING
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
@ -31,7 +31,7 @@ execute_process(
configure_file(${SRC} ${DST} @ONLY) configure_file(${SRC} ${DST} @ONLY)
if(CMAKE_SYSTEM_NAME STREQUAL "Windows") if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
execute_process( 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/VERSIONTOKEN/\${GIT_VERSION_STRING}/\"
COMMAND sed -e \"s/PRODVTOKEN/\${CANONICAL_VERSION_STRING}/\" COMMAND sed -e \"s/PRODVTOKEN/\${CANONICAL_VERSION_STRING}/\"
OUTPUT_FILE ${CMAKE_BINARY_DIR}/staging/subsurface.nsi OUTPUT_FILE ${CMAKE_BINARY_DIR}/staging/subsurface.nsi