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: successfully create the subsurface.nsi file

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2015-12-17 16:34:39 -08:00
parent c7278cd9ed
commit dd1c1359a1
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmake/Modules/HandleVersionGeneration.cmake
View file

@ -9,10 +9,11 @@ file(COPY cmake/Modules/version.cmake
DESTINATION ${CMAKE_BINARY_DIR}) DESTINATION ${CMAKE_BINARY_DIR})
add_custom_target( add_custom_target(
version ALL COMMAND ${CMAKE_COMMAND} ${CMAKE_COMMAND} version ALL COMMAND ${CMAKE_COMMAND}
-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} -D CMAKE_TOP_SRC_DIR=${CMAKE_SOURCE_DIR}
-D CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR}
-P ${CMAKE_BINARY_DIR}/version.cmake -P ${CMAKE_BINARY_DIR}/version.cmake
) )

10
cmake/Modules/version.cmake
View file

@ -9,12 +9,6 @@ endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Windows") if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
set(VER_OS win) set(VER_OS win)
endif() 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( execute_process(
COMMAND sh ${CMAKE_TOP_SRC_DIR}/scripts/get-version linux COMMAND sh ${CMAKE_TOP_SRC_DIR}/scripts/get-version linux
WORKING_DIRECTORY ${CMAKE_TOP_SRC_DIR} WORKING_DIRECTORY ${CMAKE_TOP_SRC_DIR}
@ -32,8 +26,8 @@ configure_file(${SRC} ${DST} @ONLY)
if(CMAKE_SYSTEM_NAME STREQUAL "Windows") if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
execute_process( execute_process(
COMMAND cat ${CMAKE_TOP_SRC_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
) )
endif() endif()