From fe6886d273bf130266155a23d9e13ef1b12b544a Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Mon, 18 Nov 2013 22:05:16 +0000 Subject: [PATCH] - bugfix for cmake builds handling of help2man for empty executable paths --- source/g3d_viewer/CMakeLists.txt | 15 ++++++++++----- source/glest_game/CMakeLists.txt | 13 +++++++++---- source/glest_map_editor/CMakeLists.txt | 15 ++++++++++----- 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt index dbb66159..b6925c2d 100644 --- a/source/g3d_viewer/CMakeLists.txt +++ b/source/g3d_viewer/CMakeLists.txt @@ -134,7 +134,12 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) ENDIF() ENDIF() - MESSAGE(STATUS "***Note: The final output path for Megaglest G3d Viewer will be [${EXECUTABLE_OUTPUT_PATH}]") + SET(HELP2MAN_OUT_PATH ${EXECUTABLE_OUTPUT_PATH}) + IF("${EXECUTABLE_OUTPUT_PATH}" STREQUAL "") + SET(HELP2MAN_OUT_PATH "./") + ENDIF() + + MESSAGE(STATUS "***Note: The final output path for Megaglest G3d Viewer will be [${HELP2MAN_OUT_PATH}]") FIND_PROGRAM(HELP2MAN "help2man") @@ -154,7 +159,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS}) IF(EXISTS ${HELP2MAN}) - MESSAGE("***-- Found help2man: ${HELP2MAN} about to build manpage in [${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE}]") + MESSAGE("***-- Found help2man: ${HELP2MAN} about to build manpage in [${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}]") SET(MG_MANPAGE_DESCRIPTION "G3D Model editor for the popular 3D realtime stragegy game") @@ -162,11 +167,11 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.") add_custom_target(${TARGET_NAME_MANPAGE} ALL - COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${HELP2MAN} --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME} + COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${HELP2MAN} --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE} ${HELP2MAN_OUT_PATH}${TARGET_NAME} DEPENDS ${TARGET_NAME}) ELSE() add_custom_target(${TARGET_NAME_MANPAGE} ALL - COMMAND ${HELP2MAN} --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME} + COMMAND ${HELP2MAN} --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE} ${HELP2MAN_OUT_PATH}${TARGET_NAME} DEPENDS ${TARGET_NAME}) ENDIF() ENDIF() @@ -183,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 9556035c..ad07f6b7 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/glest_game/CMakeLists.txt @@ -256,8 +256,13 @@ IF(BUILD_MEGAGLEST) ENDIF() TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS}) + SET(HELP2MAN_OUT_PATH ${EXECUTABLE_OUTPUT_PATH}) + IF("${EXECUTABLE_OUTPUT_PATH}" STREQUAL "") + SET(HELP2MAN_OUT_PATH "./") + ENDIF() + IF(EXISTS ${HELP2MAN}) - MESSAGE("***-- Found help2man: ${HELP2MAN} about to build manpage in [${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE}]") + MESSAGE("***-- Found help2man: ${HELP2MAN} about to build manpage in [${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}]") SET(MG_MANPAGE_DESCRIPTION "3D multi-player real time strategy game") @@ -265,11 +270,11 @@ IF(BUILD_MEGAGLEST) MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.") add_custom_target(${TARGET_NAME_MANPAGE} ALL - COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${HELP2MAN} --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME} + COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${HELP2MAN} --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE} ${HELP2MAN_OUT_PATH}${TARGET_NAME} DEPENDS ${TARGET_NAME}) ELSE() add_custom_target(${TARGET_NAME_MANPAGE} ALL - COMMAND ${HELP2MAN} --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME} + COMMAND ${HELP2MAN} --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE} ${HELP2MAN_OUT_PATH}${TARGET_NAME} DEPENDS ${TARGET_NAME}) ENDIF() ENDIF() @@ -288,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 668a12ec..8adacc94 100644 --- a/source/glest_map_editor/CMakeLists.txt +++ b/source/glest_map_editor/CMakeLists.txt @@ -120,7 +120,12 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) ENDIF() ENDIF() - MESSAGE(STATUS "***Note: The final output path for Megaglest Map Editor will be [${EXECUTABLE_OUTPUT_PATH}]") + SET(HELP2MAN_OUT_PATH ${EXECUTABLE_OUTPUT_PATH}) + IF("${EXECUTABLE_OUTPUT_PATH}" STREQUAL "") + SET(HELP2MAN_OUT_PATH "./") + ENDIF() + + MESSAGE(STATUS "***Note: The final output path for Megaglest Map Editor will be [${HELP2MAN_OUT_PATH}]") FIND_PROGRAM(HELP2MAN "help2man") @@ -149,7 +154,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS}) IF(EXISTS ${HELP2MAN}) - MESSAGE("***-- Found help2man: ${HELP2MAN} about to build manpage in [${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE}]") + MESSAGE("***-- Found help2man: ${HELP2MAN} about to build manpage in [${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}]") SET(MG_MANPAGE_DESCRIPTION "Map editor for the popular 3D realtime stragegy game") @@ -157,11 +162,11 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.") add_custom_target(${TARGET_NAME_MANPAGE} ALL - COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${HELP2MAN} --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME} + COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${HELP2MAN} --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE} ${HELP2MAN_OUT_PATH}${TARGET_NAME} DEPENDS ${TARGET_NAME}) ELSE() add_custom_target(${TARGET_NAME_MANPAGE} ALL - COMMAND ${HELP2MAN} --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME} + COMMAND ${HELP2MAN} --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE} ${HELP2MAN_OUT_PATH}${TARGET_NAME} DEPENDS ${TARGET_NAME}) ENDIF() ENDIF() @@ -179,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()