From 642a26bdb568450deba6ea0e26030c50ac15d118 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Mon, 18 Nov 2013 23:10:38 +0000 Subject: [PATCH] - bugfix for cmake builds handling of help2man for empty executable paths --- source/g3d_viewer/CMakeLists.txt | 4 ++-- source/glest_game/CMakeLists.txt | 4 ++-- source/glest_map_editor/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt index c6124330..e32d7e46 100644 --- a/source/g3d_viewer/CMakeLists.txt +++ b/source/g3d_viewer/CMakeLists.txt @@ -136,7 +136,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) SET(HELP2MAN_OUT_PATH ${EXECUTABLE_OUTPUT_PATH}) IF("${EXECUTABLE_OUTPUT_PATH}" STREQUAL "") - SET(HELP2MAN_OUT_PATH "./") + SET(HELP2MAN_OUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/") ENDIF() MESSAGE(STATUS "***Note: The final output path for Megaglest G3d Viewer will be [${HELP2MAN_OUT_PATH}]") @@ -188,7 +188,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) # Installation of the program manpage file INSTALL(FILES - "${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE}" + "${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}" DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH}) ENDIF() diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt index 0e4c00c8..0c9bec82 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/glest_game/CMakeLists.txt @@ -258,7 +258,7 @@ IF(BUILD_MEGAGLEST) SET(HELP2MAN_OUT_PATH ${EXECUTABLE_OUTPUT_PATH}) IF("${EXECUTABLE_OUTPUT_PATH}" STREQUAL "") - SET(HELP2MAN_OUT_PATH "./") + SET(HELP2MAN_OUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/") ENDIF() IF(EXISTS ${HELP2MAN}) @@ -293,7 +293,7 @@ IF(BUILD_MEGAGLEST) # Installation of the program manpage file INSTALL(FILES - "${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE}" + "${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}" DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH}) ENDIF() diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt index d42956c6..71b98814 100644 --- a/source/glest_map_editor/CMakeLists.txt +++ b/source/glest_map_editor/CMakeLists.txt @@ -122,7 +122,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) SET(HELP2MAN_OUT_PATH ${EXECUTABLE_OUTPUT_PATH}) IF("${EXECUTABLE_OUTPUT_PATH}" STREQUAL "") - SET(HELP2MAN_OUT_PATH "./") + SET(HELP2MAN_OUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/") ENDIF() MESSAGE(STATUS "***Note: The final output path for Megaglest Map Editor will be [${HELP2MAN_OUT_PATH}]") @@ -184,7 +184,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) # Installation of the program manpage file INSTALL(FILES - "${EXECUTABLE_OUTPUT_PATH}{TARGET_NAME_MANPAGE}" + "${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}" DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH}) ENDIF()