Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

In Windows NSIS Installer use version from cmake

Browse source
This commit is contained in:
Pali Rohár 2013-02-05 22:27:43 +01:00
parent 2f667d0c85
commit 2fc762b2d9
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -43,9 +43,10 @@ project(stratagus)
cmake_minimum_required(VERSION 2.6)
set(STRATAGUS_VERSION "${STRATAGUS_MAJOR_VERSION}.${STRATAGUS_MINOR_VERSION}.${STRATAGUS_PATCH_LEVEL}")
set(STRATAGUS_VERSION_FULL "${STRATAGUS_VERSION}.${STRATAGUS_PATCH_LEVEL2}")
if(${STRATAGUS_PATCH_LEVEL2} GREATER 0)
set(STRATAGUS_VERSION "${STRATAGUS_VERSION}.${STRATAGUS_PATCH_LEVEL2}")
set(STRATAGUS_VERSION "${STRATAGUS_VERSION_FULL}")
endif()
# Stratagus sources
@ -1118,7 +1119,7 @@ if(WIN32 AND ENABLE_NSIS AND MAKENSIS_FOUND)
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/COPYING DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/win32/stratagus.ico DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
add_custom_command(OUTPUT Stratagus-${STRATAGUS_VERSION}${MAKENSIS_SUFFIX}
COMMAND ${MAKENSIS} ARGS ${MAKENSIS_FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/src/win32/stratagus.nsi
COMMAND ${MAKENSIS} ARGS ${MAKENSIS_FLAGS} -DVERSION=${STRATAGUS_VERSION} -DVIVERSION=${STRATAGUS_VERSION_FULL} ${CMAKE_CURRENT_SOURCE_DIR}/src/win32/stratagus.nsi
DEPENDS src/win32/stratagus.nsi stratagus COPYING
COMMENT "Generating Stratagus Windows NSIS Installer"
VERBATIM

2
src/win32/stratagus.nsi
View file

@ -45,8 +45,6 @@
!define NAME "Stratagus"
!define DESCRIPTION "Strategy Gaming Engine"
!define VERSION "2.2.7"
!define VIVERSION "${VERSION}.0"
!define HOMEPAGE "https://launchpad.net/stratagus"
!define LICENSE "GPL v2"
!define COPYRIGHT "Copyright (c) 1998-2012 by The Stratagus Project"