diff --git a/CMakeLists.txt b/CMakeLists.txt index b5eb12535..b44801906 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -315,6 +315,12 @@ SET(SDL_WINDOWS_DIR_DINC "SDL-2.0.x") SET(SDL_VERSION_NAME "SDL2") 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) IF(UNIX AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") SET(ZETAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/linux/") diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt index 81ee2e7c2..f8abae2c4 100644 --- a/source/g3d_viewer/CMakeLists.txt +++ b/source/g3d_viewer/CMakeLists.txt @@ -188,7 +188,7 @@ IF(BUILD_ZETAGLEST_MODEL_VIEWER) SET(HELP2MAN_OUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/") 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") @@ -227,7 +227,7 @@ IF(BUILD_ZETAGLEST_MODEL_VIEWER) # Installation of the program INSTALL(TARGETS ${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) MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${ZETAGLEST_MANPAGE_INSTALL_PATH}]") diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt index 17104e116..d72009673 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/glest_game/CMakeLists.txt @@ -260,11 +260,7 @@ IF(BUILD_ZETAGLEST) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-subsystem,console -mconsole") ENDIF() - IF(WANT_DEV_OUTPATH) - 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}]") + MESSAGE(STATUS "\n***Note: The final output path for the ZetaGlest engine will be [${ZETAGLEST_BIN_OUTPUT_DIR}]\n") SET_SOURCE_FILES_PROPERTIES(${ZG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) @@ -322,6 +318,9 @@ IF(BUILD_ZETAGLEST) 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 IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "") MESSAGE(STATUS "**Source package INSTALL TRIGGERED [${PROJECT_SOURCE_DIR}]") @@ -329,7 +328,7 @@ IF(BUILD_ZETAGLEST) # Installation of the program INSTALL(TARGETS ${TARGET_NAME} - DESTINATION ${ZETAGLEST_BIN_INSTALL_PATH}) + DESTINATION "${ZETAGLEST_BIN_OUTPUT_DIR}") IF(EXISTS ${HELP2MAN} AND NOT "${ZETAGLEST_MANPAGE_INSTALL_PATH}" STREQUAL "") MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${ZETAGLEST_MANPAGE_INSTALL_PATH}]") diff --git a/source/glest_game/global/config.cpp b/source/glest_game/global/config.cpp index c50681646..f6d7b15cd 100644 --- a/source/glest_game/global/config.cpp +++ b/source/glest_game/global/config.cpp @@ -229,11 +229,11 @@ namespace Glest { } #endif -#if defined(MG_CMAKE_INSTALL_PREFIX) +#if defined(CMAKE_INSTALL_PREFIX) if (foundPath == false) { foundPath = tryCustomPath(cfgType, fileName, - formatPath(TOSTRING(MG_CMAKE_INSTALL_PREFIX))); + formatPath(TOSTRING(CMAKE_INSTALL_PREFIX))); } #endif diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt index 6bb778468..aa3de2d87 100644 --- a/source/glest_map_editor/CMakeLists.txt +++ b/source/glest_map_editor/CMakeLists.txt @@ -159,16 +159,12 @@ IF(BUILD_ZETAGLEST_MAP_EDITOR) ENDIF(APPLE) ENDFOREACH(DIR) - IF(WANT_DEV_OUTPATH) - SET(EXECUTABLE_OUTPUT_PATH "${ZETAGLEST_FRIENDLY_OUTPUT_PATH}") - ENDIF() - SET(HELP2MAN_OUT_PATH ${EXECUTABLE_OUTPUT_PATH}) IF("${EXECUTABLE_OUTPUT_PATH}" STREQUAL "") SET(HELP2MAN_OUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/") 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") @@ -216,7 +212,7 @@ IF(BUILD_ZETAGLEST_MAP_EDITOR) # Installation of the program INSTALL(TARGETS ${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) MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${ZETAGLEST_MANPAGE_INSTALL_PATH}]")