Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- updated cmake builds scripts to not fail if help2man is not installed

This commit is contained in:
Mark Vejvoda 2011-12-14 09:39:03 +00:00
parent b233371061
commit eca4f1934f
4 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mk/linux/mg-version.sh
View File

@ -5,7 +5,8 @@
# Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
OLD_MG_VERSION=3.6.0.1
MG_VERSION=3.6.1-dev
#MG_VERSION=3.6.1-dev
MG_VERSION=3.6.0.2
if [ "$1" = "--oldversion" ]; then
echo "$OLD_MG_VERSION"

11
source/g3d_viewer/CMakeLists.txt
View File

@ -154,18 +154,11 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
${TARGET_NAME}
DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
# Check if we are running from an SVN folder structure or tarballs
IF(EXISTS "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.desktop")
IF(EXISTS "${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}")
# Installation of the program manpage file
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/mk/linux/${TARGET_NAME_MANPAGE}"
"${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}"
DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
ELSE()
# Installation of the program manpage file
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/${TARGET_NAME_MANPAGE}"
DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
ENDIF()
# Installation of the program config and image files

19
source/glest_game/CMakeLists.txt
View File

@ -234,6 +234,13 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
${TARGET_NAME}
DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
IF(EXISTS "${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}")
# Installation of the program manpage file
INSTALL(FILES
"${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}"
DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
ENDIF()
# Check if we are running from an SVN folder structure or tarballs
IF(EXISTS "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.desktop")
MESSAGE(STATUS "**Source package detected svn folder structure.")
@ -252,12 +259,6 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
"${PROJECT_SOURCE_DIR}/mk/linux/glest.ico"
"${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
# Installation of the program manpage file
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/mk/linux/${TARGET_NAME_MANPAGE}"
DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
ELSE()
# Installation of the program desktop file
@ -274,11 +275,5 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
"${PROJECT_SOURCE_DIR}/glest.ico"
"${PROJECT_SOURCE_DIR}/g3dviewer.ico"
DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
# Installation of the program manpage file
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/${TARGET_NAME_MANPAGE}"
DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
ENDIF()
ENDIF()

11
source/glest_map_editor/CMakeLists.txt
View File

@ -149,18 +149,11 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
${TARGET_NAME}
DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
# Check if we are running from an SVN folder structure or tarballs
IF(EXISTS "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.desktop")
IF(EXISTS "${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}")
# Installation of the program manpage file
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/mk/linux/${TARGET_NAME_MANPAGE}"
"${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}"
DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
ELSE()
# Installation of the program manpage file
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/${TARGET_NAME_MANPAGE}"
DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
ENDIF()
# Installation of the program config and image files