Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop
This commit is contained in:
commit
d1df0c80d9
|
@ -376,53 +376,55 @@ 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
|
||||||
libcurl4-gnutls-dev | libcurl4-nss-dev,
|
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "
|
||||||
libfontconfig1-dev,
|
libcurl4-gnutls-dev | libcurl4-nss-dev,
|
||||||
libftgl-dev,
|
libfontconfig1-dev,
|
||||||
libglew-dev,
|
libftgl-dev,
|
||||||
libircclient-dev,
|
libglew-dev,
|
||||||
libjpeg-dev,
|
libircclient-dev,
|
||||||
liblua5.1-0-dev,
|
libjpeg-dev,
|
||||||
libminiupnpc-dev,
|
liblua5.1-0-dev,
|
||||||
libogg-dev,
|
libminiupnpc-dev,
|
||||||
libopenal-dev,
|
libogg-dev,
|
||||||
libpng12-dev,
|
libopenal-dev,
|
||||||
libsdl1.2-dev,
|
libpng12-dev,
|
||||||
libvlc-dev,
|
libsdl1.2-dev,
|
||||||
libvorbis-dev,
|
libvlc-dev,
|
||||||
libwxgtk2.8-dev,
|
libvorbis-dev,
|
||||||
libxerces-c2-dev,
|
libwxgtk2.8-dev,
|
||||||
libxml2-dev,
|
libxerces-c2-dev,
|
||||||
libz-dev,
|
libxml2-dev,
|
||||||
libfribidi-dev")
|
libz-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 )
|
||||||
|
|
Loading…
Reference in New Issue