Commit 43ccf42f authored by Gerhard Stein's avatar Gerhard Stein

Variable fixes for windows builds

parent 2ac619e9
...@@ -28,6 +28,12 @@ MESSAGE(STATUS "Preparing the Build-System for Commander Genius" ) ...@@ -28,6 +28,12 @@ MESSAGE(STATUS "Preparing the Build-System for Commander Genius" )
execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/get_version.sh OUTPUT_VARIABLE CG_VERSION) execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/get_version.sh OUTPUT_VARIABLE CG_VERSION)
string(REGEX REPLACE "[\r\n]" "" CG_VERSION "${CG_VERSION}") string(REGEX REPLACE "[\r\n]" "" CG_VERSION "${CG_VERSION}")
# Since shell script get_version is not processed properly on windows, we have to define manually here.
# TODO: Better system for defining the version
IF(WIN32)
set(CG_VERSION "2.0.1")
endif()
# Generate the README file with the correct version string # Generate the README file with the correct version string
configure_file(README.in README) configure_file(README.in README)
configure_file(README.in ${CMAKE_BINARY_DIR}/README) configure_file(README.in ${CMAKE_BINARY_DIR}/README)
...@@ -66,4 +72,10 @@ add_subdirectory("GsKit") ...@@ -66,4 +72,10 @@ add_subdirectory("GsKit")
# And build Commander Genius on top of that! # And build Commander Genius on top of that!
add_subdirectory("src") add_subdirectory("src")
MESSAGE( STATUS "CG_VERSION = ${CG_VERSION}" )
INCLUDE(package.cmake) INCLUDE(package.cmake)
MESSAGE( STATUS "Build system is prepared. To Build the project just type \"make\"" )
MESSAGE( STATUS "If you want to create the installation package just type \"make package\" after you build the project" )
Subproject commit 389cee9ff0937d9e772803c1b36993fba2decc6b Subproject commit 2a97bd3a785cc25548a20189d0a1203aa78abf97
v2.0.1: v2.0.1:
------- -------
- Path fixes under windows
- Updated GsKit
v2.0.0: v2.0.0:
......
...@@ -16,7 +16,7 @@ SET(CPACK_PACKAGE_DESCRIPTION "Commander-Genius aka CloneKeenPlus is an engine w ...@@ -16,7 +16,7 @@ SET(CPACK_PACKAGE_DESCRIPTION "Commander-Genius aka CloneKeenPlus is an engine w
SET(CPACK_PACKAGE_VENDOR "The Commmander-Genius Team") SET(CPACK_PACKAGE_VENDOR "The Commmander-Genius Team")
SET(CPACK_PACKAGE_VERSION ${CG_VERSION}) SET(CPACK_PACKAGE_VERSION ${CG_VERSION})
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/README") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/README")
SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${BUILD_TARGET}") SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_BUILD_TYPE}")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYRIGHT") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYRIGHT")
...@@ -45,6 +45,7 @@ IF(WIN32) ...@@ -45,6 +45,7 @@ IF(WIN32)
SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\clonekeenplus.sourceforge.net") SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\clonekeenplus.sourceforge.net")
SET(CPACK_NSIS_CONTACT "gerstrong@gmail.com") SET(CPACK_NSIS_CONTACT "gerstrong@gmail.com")
SET(CPACK_NSIS_MODIFY_PATH OFF) SET(CPACK_NSIS_MODIFY_PATH OFF)
SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_BUILD_TYPE}-win32")
set(CPACK_NSIS_CREATE_ICONS "CreateShortCut '\$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Commander Genius.lnk' '\$INSTDIR\\\\CGenius\\\\CGenius.exe'") set(CPACK_NSIS_CREATE_ICONS "CreateShortCut '\$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Commander Genius.lnk' '\$INSTDIR\\\\CGenius\\\\CGenius.exe'")
ENDIF() ENDIF()
...@@ -101,7 +102,3 @@ INCLUDE(CPack) ...@@ -101,7 +102,3 @@ INCLUDE(CPack)
MESSAGE( STATUS "CPACK_PACKAGE_VERSION = ${CPACK_PACKAGE_VERSION}" ) MESSAGE( STATUS "CPACK_PACKAGE_VERSION = ${CPACK_PACKAGE_VERSION}" )
MESSAGE( STATUS "Build system is prepared. To Build the project just type \"make\"" )
MESSAGE( STATUS "If you want to create the installation package just type \"make package\" after you build the project" )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment