--- marsshooter/CMakeLists.txt.orig 2014-05-07 17:32:52.000000000 +0600 +++ marsshooter/CMakeLists.txt 2016-01-10 19:40:55.000000000 +0600 @@ -7,18 +7,21 @@ # version number set(mars_MAJOR 0) set(mars_MINOR 7) -set(mars_PATCH 5) +set(mars_PATCH 6) set(mars_VERSION ${mars_MAJOR}.${mars_MINOR}.${mars_PATCH}) set(mars_DESCRIPTION "M.A.R.S. - a ridiculous Shooter") set(mars_HOMEPAGE "http://www.marsshooter.org") -set(mars_EXENAME "mars") +set(mars_EXENAME "marsshooter") set(mars_PACKAGENAME "mars") # We require at least version 2.8.0 cmake_minimum_required(VERSION 2.8.0) -# Location where cmake first looks for modules. -set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules) +##################################################################### +# Installation directories +##################################################################### +set(mars_DATA_DEST_DIR ${CMAKE_INSTALL_PREFIX}/share/games/marsshooter CACHE STRING "marsshooter data files destdir") +set(mars_EXE_DEST_DIR ${CMAKE_INSTALL_PREFIX}/games CACHE STRING "marsshooter exe destdir") ##################################################################### # Configure and find libraries @@ -29,8 +32,10 @@ find_package(OpenGL REQUIRED) include_directories(${OPENGL_INCLUDE_DIR}) # find the sfml2 headers and library -find_package(SFML REQUIRED audio graphics window system) -include_directories(${SFML_INCLUDE_DIR}) +include(FindPkgConfig) +pkg_check_modules(SFML REQUIRED sfml-audio>=2.0 sfml-graphics>=2.0 + sfml-window>=2.0 sfml-system>=2.0) +include_directories(${SFML_INCLUDE_DIRS}) # Foundation library needed for apple if(APPLE) @@ -63,7 +68,7 @@ endif(APPLE) ##################################################################### # compile source -set(CMAKE_CXX_FLAGS "-s -O2") +set(CMAKE_CXX_FLAGS "-s -O2" CACHE STRING "CXX flags") add_subdirectory(src) ##################################################################### --- marsshooter/src/CMakeLists.txt.orig 2014-05-07 17:32:52.000000000 +0600 +++ marsshooter/src/CMakeLists.txt 2016-01-10 19:40:55.000000000 +0600 @@ -11,7 +11,7 @@ file(GLOB MARS_RESOURCES ${MARS_SOURCE_D # create executable if(APPLE) add_executable( - mars MACOSX_BUNDLE + marsshooter MACOSX_BUNDLE main.cpp ${MARS_SOURCES} ${MARS_HEADERS} @@ -40,7 +40,7 @@ if(APPLE) ) else(APPLE) add_executable( - mars + marsshooter main.cpp ${MARS_SOURCES} ${MARS_HEADERS} @@ -50,7 +50,7 @@ endif(APPLE) # link SFML and other libraries target_link_libraries( - mars + marsshooter ${FOUNDATION_LIBRARY} ${SFML_LIBRARIES} ${OPENGL_LIBRARIES} @@ -66,9 +66,9 @@ target_link_libraries( if(UNIX) install( TARGETS - mars + marsshooter RUNTIME DESTINATION - ${CMAKE_INSTALL_PREFIX}/games + ${mars_EXE_DEST_DIR} ) install( FILES @@ -82,7 +82,7 @@ if(UNIX) ${MARS_SOURCE_DIR}/data/botnames.txt ${MARS_SOURCE_DIR}/data/shipnames.txt DESTINATION - ${CMAKE_INSTALL_PREFIX}/share/games/marsshooter + ${mars_DATA_DEST_DIR} ) install( DIRECTORY @@ -92,47 +92,60 @@ if(UNIX) ${CMAKE_SOURCE_DIR}/data/shaders ${CMAKE_SOURCE_DIR}/data/tex DESTINATION - ${CMAKE_INSTALL_PREFIX}/share/games/marsshooter + ${mars_DATA_DEST_DIR} PATTERN ".svn" EXCLUDE ) # icons install( FILES - ${MARS_SOURCE_DIR}/resources/mars.png + ${MARS_SOURCE_DIR}/resources/marsshooter.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/512x512/apps ) install( FILES - ${MARS_SOURCE_DIR}/resources/mars.svg + ${MARS_SOURCE_DIR}/resources/marsshooter.svg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps ) install( FILES - ${MARS_SOURCE_DIR}/resources/mars.xpm + ${MARS_SOURCE_DIR}/resources/marsshooter.xpm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps ) # desktop file install( FILES - ${MARS_SOURCE_DIR}/resources/mars.desktop + ${MARS_SOURCE_DIR}/resources/marsshooter.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications ) + # appdata file install( FILES - ${MARS_SOURCE_DIR}/resources/mars + ${MARS_SOURCE_DIR}/resources/marsshooter.appdata.xml DESTINATION - ${CMAKE_INSTALL_PREFIX}/share/menu + ${CMAKE_INSTALL_PREFIX}/share/appdata ) - + # manpage + install( + FILES + ${MARS_SOURCE_DIR}/resources/marsshooter.6 + DESTINATION + ${CMAKE_INSTALL_PREFIX}/share/man/man6 + ) + #install( + #FILES + #${MARS_SOURCE_DIR}/resources/mars + #DESTINATION + #${CMAKE_INSTALL_PREFIX}/share/menu + #) else(UNIX) # executable install( - TARGETS mars + TARGETS marsshooter RUNTIME DESTINATION . BUNDLE DESTINATION . )