mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-01 20:12:40 +02:00
Code Issues Projects Releases Wiki Activity

CMakeLists.txt:make install work

Browse Source 
closes #110
closes #147
This commit is contained in:
andy5995
2018-09-11 23:06:33 -05:00
committed by Andy Alt
parent aa54e2032b
commit d9e71d3798
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -315,6 +315,12 @@ SET(SDL_WINDOWS_DIR_DINC "SDL-2.0.x")
SET(SDL_VERSION_NAME "SDL2") SET(SDL_VERSION_NAME "SDL2")
SET(SDL_VERSION_SNAME "sdl") SET(SDL_VERSION_SNAME "sdl")
IF (NOT ZETAGLEST_BIN_INSTALL_PATH STREQUAL "")
SET(ZETAGLEST_BIN_OUTPUT_DIR "${CMAKE_INSTALL_PREFIX}/bin")
ELSE()
SET(ZETAGLEST_BIN_OUTPUT_DIR "${ZETAGLEST_BIN_INSTALL_PREFIX}")
ENDIF()
OPTION(WANT_DEV_OUTPATH "Use developer friendly output paths." OFF) OPTION(WANT_DEV_OUTPATH "Use developer friendly output paths." OFF)
IF(UNIX AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") IF(UNIX AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
SET(ZETAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/linux/") SET(ZETAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/linux/")

4
source/g3d_viewer/CMakeLists.txt
View File

@@ -188,7 +188,7 @@ IF(BUILD_ZETAGLEST_MODEL_VIEWER)
SET(HELP2MAN_OUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/") SET(HELP2MAN_OUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/")
ENDIF() ENDIF()
MESSAGE(STATUS "***Note: The final output path for ZetaGlest G3d Viewer will be [${HELP2MAN_OUT_PATH}]") MESSAGE(STATUS "\n***Note: The final output path for ZetaGlest G3d Viewer will be [${ZETAGLEST_BIN_OUTPUT_DIR}]\n")
FIND_PROGRAM(HELP2MAN "help2man") FIND_PROGRAM(HELP2MAN "help2man")
@@ -227,7 +227,7 @@ IF(BUILD_ZETAGLEST_MODEL_VIEWER)
# Installation of the program # Installation of the program
INSTALL(TARGETS INSTALL(TARGETS
${TARGET_NAME} ${TARGET_NAME}
DESTINATION ${ZETAGLEST_BIN_INSTALL_PATH}) DESTINATION ${ZETAGLEST_BIN_OUTPUT_DIR})
IF(EXISTS ${HELP2MAN} AND NOT "${ZETAGLEST_MANPAGE_INSTALL_PATH}" STREQUAL "" AND NOT APPLE) IF(EXISTS ${HELP2MAN} AND NOT "${ZETAGLEST_MANPAGE_INSTALL_PATH}" STREQUAL "" AND NOT APPLE)
MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${ZETAGLEST_MANPAGE_INSTALL_PATH}]") MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${ZETAGLEST_MANPAGE_INSTALL_PATH}]")

11
source/glest_game/CMakeLists.txt
View File

@@ -260,11 +260,7 @@ IF(BUILD_ZETAGLEST)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-subsystem,console -mconsole") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-subsystem,console -mconsole")
ENDIF() ENDIF()
IF(WANT_DEV_OUTPATH) MESSAGE(STATUS "\n***Note: The final output path for the ZetaGlest engine will be [${ZETAGLEST_BIN_OUTPUT_DIR}]\n")
SET(EXECUTABLE_OUTPUT_PATH "${ZETAGLEST_FRIENDLY_OUTPUT_PATH}")
ENDIF()
MESSAGE(STATUS "***Note: The final output path for the ZetaGlest engine will be [${EXECUTABLE_OUTPUT_PATH}]")
SET_SOURCE_FILES_PROPERTIES(${ZG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) SET_SOURCE_FILES_PROPERTIES(${ZG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
@@ -322,6 +318,9 @@ IF(BUILD_ZETAGLEST)
ENDIF() ENDIF()
ENDIF() ENDIF()
IF (NOT ZG_CMAKE_INSTALL_PREFIX STREQUAL "")
SET(CMAKE_INSTALL_PREFIX "${ZG_CMAKE_INSTALL_PREFIX}")
ENDIF()
# Requires an install prefix for the items below to work # Requires an install prefix for the items below to work
IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "") IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
MESSAGE(STATUS "**Source package INSTALL TRIGGERED [${PROJECT_SOURCE_DIR}]") MESSAGE(STATUS "**Source package INSTALL TRIGGERED [${PROJECT_SOURCE_DIR}]")
@@ -329,7 +328,7 @@ IF(BUILD_ZETAGLEST)
# Installation of the program # Installation of the program
INSTALL(TARGETS INSTALL(TARGETS
${TARGET_NAME} ${TARGET_NAME}
DESTINATION ${ZETAGLEST_BIN_INSTALL_PATH}) DESTINATION "${ZETAGLEST_BIN_OUTPUT_DIR}")
IF(EXISTS ${HELP2MAN} AND NOT "${ZETAGLEST_MANPAGE_INSTALL_PATH}" STREQUAL "") IF(EXISTS ${HELP2MAN} AND NOT "${ZETAGLEST_MANPAGE_INSTALL_PATH}" STREQUAL "")
MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${ZETAGLEST_MANPAGE_INSTALL_PATH}]") MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${ZETAGLEST_MANPAGE_INSTALL_PATH}]")

4
source/glest_game/global/config.cpp
View File

@@ -229,11 +229,11 @@ namespace Glest {
} }
#endif #endif
#if defined(MG_CMAKE_INSTALL_PREFIX) #if defined(CMAKE_INSTALL_PREFIX)
if (foundPath == false) { if (foundPath == false) {
foundPath = foundPath =
tryCustomPath(cfgType, fileName, tryCustomPath(cfgType, fileName,
formatPath(TOSTRING(MG_CMAKE_INSTALL_PREFIX))); formatPath(TOSTRING(CMAKE_INSTALL_PREFIX)));
} }
#endif #endif

8
source/glest_map_editor/CMakeLists.txt
View File

@@ -159,16 +159,12 @@ IF(BUILD_ZETAGLEST_MAP_EDITOR)
ENDIF(APPLE) ENDIF(APPLE)
ENDFOREACH(DIR) ENDFOREACH(DIR)
IF(WANT_DEV_OUTPATH)
SET(EXECUTABLE_OUTPUT_PATH "${ZETAGLEST_FRIENDLY_OUTPUT_PATH}")
ENDIF()
SET(HELP2MAN_OUT_PATH ${EXECUTABLE_OUTPUT_PATH}) SET(HELP2MAN_OUT_PATH ${EXECUTABLE_OUTPUT_PATH})
IF("${EXECUTABLE_OUTPUT_PATH}" STREQUAL "") IF("${EXECUTABLE_OUTPUT_PATH}" STREQUAL "")
SET(HELP2MAN_OUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/") SET(HELP2MAN_OUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/")
ENDIF() ENDIF()
MESSAGE(STATUS "***Note: The final output path for ZetaGlest Map Editor will be [${HELP2MAN_OUT_PATH}]") MESSAGE(STATUS "\n***Note: The final output path for ZetaGlest Map Editor will be [${ZETAGLEST_BIN_OUTPUT_DIR}]\n")
FIND_PROGRAM(HELP2MAN "help2man") FIND_PROGRAM(HELP2MAN "help2man")
@@ -216,7 +212,7 @@ IF(BUILD_ZETAGLEST_MAP_EDITOR)
# Installation of the program # Installation of the program
INSTALL(TARGETS INSTALL(TARGETS
${TARGET_NAME} ${TARGET_NAME}
DESTINATION ${ZETAGLEST_BIN_INSTALL_PATH}) DESTINATION ${ZETAGLEST_BIN_OUTPUT_DIR})
IF(EXISTS ${HELP2MAN} AND NOT "${ZETAGLEST_MANPAGE_INSTALL_PATH}" STREQUAL "" AND NOT APPLE) IF(EXISTS ${HELP2MAN} AND NOT "${ZETAGLEST_MANPAGE_INSTALL_PATH}" STREQUAL "" AND NOT APPLE)
MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${ZETAGLEST_MANPAGE_INSTALL_PATH}]") MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${ZETAGLEST_MANPAGE_INSTALL_PATH}]")