From 6818b21625951a71a6d2e06c52a111049c514596 Mon Sep 17 00:00:00 2001 From: andy5995 Date: Thu, 4 Oct 2018 23:34:57 -0500 Subject: [PATCH] cmake: touch up --- CMakeLists.txt | 2 +- source/glest_game/CMakeLists.txt | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 309a784e6..138d9ef40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -208,7 +208,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) ENDIF() 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() # The data dir will get defined as a macro at compile-time IF(NOT INSTALL_DIR_DATA) diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt index 8b694a686..2e91fea62 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/glest_game/CMakeLists.txt @@ -266,9 +266,7 @@ IF(BUILD_ZETAGLEST) TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS}) # Installation of the program - INSTALL(TARGETS - ${TARGET_NAME} - DESTINATION "${INSTALL_DIR_BIN}") + INSTALL(TARGETS ${TARGET_NAME} DESTINATION "${INSTALL_DIR_BIN}") # Installation of the program manpage file INSTALL(FILES @@ -303,8 +301,14 @@ IF(BUILD_ZETAGLEST) DESTINATION ${INSTALL_DIR_ICON}) 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 - # when "make install" isn't used + # when "make install" is NOT used. + # # add_custom_command(TARGET ${TARGET_NAME} POST_BUILD COMMAND cp "${PROJECT_SOURCE_DIR}/mk/shared/glest.ini" "${CMAKE_BINARY_DIR}"