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

cmake: touch up

Browse Source
This commit is contained in:
andy5995
2018-10-04 23:34:57 -05:00
parent 1f72cc791b
commit 6818b21625
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -208,7 +208,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
ENDIF() ENDIF()
IF(NOT INSTALL_DIR_BIN) IF(NOT INSTALL_DIR_BIN)
SET(INSTALL_DIR_BIN "${CMAKE_INSTALL_PREFIX}/games" CACHE PATH "The installation path for binaries") SET(INSTALL_DIR_BIN "${CMAKE_INSTALL_PREFIX}/games/" CACHE PATH "The installation path for binaries")
ENDIF() ENDIF()
# The data dir will get defined as a macro at compile-time # The data dir will get defined as a macro at compile-time
IF(NOT INSTALL_DIR_DATA) IF(NOT INSTALL_DIR_DATA)

12
source/glest_game/CMakeLists.txt
View File

@@ -266,9 +266,7 @@ IF(BUILD_ZETAGLEST)
TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS}) TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
# Installation of the program # Installation of the program
INSTALL(TARGETS INSTALL(TARGETS ${TARGET_NAME} DESTINATION "${INSTALL_DIR_BIN}")
${TARGET_NAME}
DESTINATION "${INSTALL_DIR_BIN}")
# Installation of the program manpage file # Installation of the program manpage file
INSTALL(FILES INSTALL(FILES
@@ -303,8 +301,14 @@ IF(BUILD_ZETAGLEST)
DESTINATION ${INSTALL_DIR_ICON}) DESTINATION ${INSTALL_DIR_ICON})
ENDIF() ENDIF()
# Installation of icon
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/mk/shared/zetaglest.ico"
DESTINATION ${INSTALL_DIR_INI})
# These files must be in the same directory as the zetaglest binary # These files must be in the same directory as the zetaglest binary
# when "make install" isn't used # when "make install" is NOT used.
#
# #
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
COMMAND cp "${PROJECT_SOURCE_DIR}/mk/shared/glest.ini" "${CMAKE_BINARY_DIR}" COMMAND cp "${PROJECT_SOURCE_DIR}/mk/shared/glest.ini" "${CMAKE_BINARY_DIR}"