mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-22 16:02:50 +02:00
Code Issues Projects Releases Wiki Activity

Only use DEB generator if CPACK_GENERATOR is unset

Browse Source 
When trying to build a dmg package on an apple system the values set in
mk/macos/CMakeLists.txt are masked by those coded in the main CMakeLists file.
This change means the values are only set if they haven't been already (eg by
using the apple CMakeLists).

I feel it would probably be better to move this lot ot mk/linux/CMakeLists and
then conditionally import the correct file - I'm happy to redo the change that
way if there is agreement on that.
This commit is contained in:
Karl Goetz
2014-12-15 13:04:05 +11:00
parent 3ecc553ba9
commit 00f116eeee
1 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
CMakeLists.txt
View File

@@ -376,9 +376,10 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
MESSAGE(WARNING ">> CLANG is NOT currently compatible as it does not support the following essential GCC compiler settings: -frounding-math -fsignaling-nans") MESSAGE(WARNING ">> CLANG is NOT currently compatible as it does not support the following essential GCC compiler settings: -frounding-math -fsignaling-nans")
ENDIF() ENDIF()
SET(CPACK_GENERATOR "DEB") IF(NOT DEFINED CPACK_GENERATOR)
SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Mark Vejvoda") #required SET(CPACK_GENERATOR "DEB")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS " SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Mark Vejvoda") #required
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "
libcurl4-gnutls-dev | libcurl4-nss-dev, libcurl4-gnutls-dev | libcurl4-nss-dev,
libfontconfig1-dev, libfontconfig1-dev,
libftgl-dev, libftgl-dev,
@@ -399,30 +400,31 @@ SET(CPACK_DEBIAN_PACKAGE_DEPENDS "
libz-dev, libz-dev,
libfribidi-dev") libfribidi-dev")
#find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems") #find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems")
#if(DPKG_PROGRAM) #if(DPKG_PROGRAM)
# execute_process( # execute_process(
# COMMAND ${DPKG_PROGRAM} --print-architecture # COMMAND ${DPKG_PROGRAM} --print-architecture
# OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE # OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
# OUTPUT_STRIP_TRAILING_WHITESPACE # OUTPUT_STRIP_TRAILING_WHITESPACE
# ) # )
#endif(DPKG_PROGRAM) #endif(DPKG_PROGRAM)
SET(CPACK_PACKAGE_NAME ${PKG_NAME}) SET(CPACK_PACKAGE_NAME ${PKG_NAME})
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MegaGlest") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MegaGlest")
SET(CPACK_PACKAGE_VENDOR "megaglest.org") SET(CPACK_PACKAGE_VENDOR "megaglest.org")
#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") #SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") #SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "megaglest") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "megaglest")
SET(CPACK_PACKAGE_VERSION_MAJOR ${VER_MAJOR}) SET(CPACK_PACKAGE_VERSION_MAJOR ${VER_MAJOR})
SET(CPACK_PACKAGE_VERSION_MINOR ${VER_MINOR}) SET(CPACK_PACKAGE_VERSION_MINOR ${VER_MINOR})
SET(CPACK_PACKAGE_VERSION_PATCH ${VER_RELEASE}) SET(CPACK_PACKAGE_VERSION_PATCH ${VER_RELEASE})
IF(WIN32) IF(WIN32)
SET(CPACK_NSIS_DISPLAY_NAME "MegaGlest") SET(CPACK_NSIS_DISPLAY_NAME "MegaGlest")
SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/mk/windoze/glest.ico") SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/mk/windoze/glest.ico")
SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/mk/windoze/megaglest.ico") SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/mk/windoze/megaglest.ico")
SET(CPACK_NSIS_URL_INFO_ABOUT "http://megaglest.org") SET(CPACK_NSIS_URL_INFO_ABOUT "http://megaglest.org")
ENDIF() ENDIF()
ENDIF(NOT DEFINED CPACK_GENERATOR)
INCLUDE(CPack) INCLUDE(CPack)
get_directory_property( DirDefs DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS ) get_directory_property( DirDefs DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS )