mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-23 16:32:53 +02:00
Code Issues Projects Releases Wiki Activity

- updated cmake scripts to fix build problems on debian

Browse Source
This commit is contained in:
Mark Vejvoda
2013-11-16 19:18:09 +00:00
parent 1dd1b8febb
commit 303746df80
5 changed files with 25 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/g3d_viewer/CMakeLists.txt
View File

@@ -128,9 +128,9 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
OPTION(WANT_DEV_OUTPATH "use developer friendly output paths" OFF) OPTION(WANT_DEV_OUTPATH "use developer friendly output paths" OFF)
IF(WANT_DEV_OUTPATH) IF(WANT_DEV_OUTPATH)
IF(UNIX AND NOT APPLE) IF(UNIX AND NOT APPLE)
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/mk/linux) SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/mk/linux/)
ELSE() ELSE()
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game) SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game/)
ENDIF() ENDIF()
ENDIF() ENDIF()
@@ -154,7 +154,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS}) TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
IF(EXISTS ${HELP2MAN}) 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 [${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE}]")
SET(MG_MANPAGE_DESCRIPTION "G3D Model editor for the popular 3D realtime stragegy game") SET(MG_MANPAGE_DESCRIPTION "G3D Model editor for the popular 3D realtime stragegy game")
@@ -162,11 +162,11 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.") MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.")
add_custom_target(${TARGET_NAME_MANPAGE} ALL 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 ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME}
DEPENDS ${TARGET_NAME}) DEPENDS ${TARGET_NAME})
ELSE() ELSE()
add_custom_target(${TARGET_NAME_MANPAGE} ALL 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 ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME}
DEPENDS ${TARGET_NAME}) DEPENDS ${TARGET_NAME})
ENDIF() ENDIF()
ENDIF() ENDIF()
@@ -183,7 +183,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
# Installation of the program manpage file # Installation of the program manpage file
INSTALL(FILES INSTALL(FILES
"${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}" "${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE}"
DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH}) DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
ENDIF() ENDIF()

12
source/glest_game/CMakeLists.txt
View File

@@ -217,9 +217,9 @@ IF(BUILD_MEGAGLEST)
OPTION(WANT_DEV_OUTPATH "use developer friendly output paths" OFF) OPTION(WANT_DEV_OUTPATH "use developer friendly output paths" OFF)
IF(WANT_DEV_OUTPATH) IF(WANT_DEV_OUTPATH)
IF(UNIX AND NOT APPLE) IF(UNIX AND NOT APPLE)
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/mk/linux) SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/mk/linux/)
ELSE() ELSE()
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game) SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game/)
ENDIF() ENDIF()
ENDIF() ENDIF()
@@ -257,7 +257,7 @@ IF(BUILD_MEGAGLEST)
TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS}) TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
IF(EXISTS ${HELP2MAN}) 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 [${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE}]")
SET(MG_MANPAGE_DESCRIPTION "3D multi-player real time strategy game") SET(MG_MANPAGE_DESCRIPTION "3D multi-player real time strategy game")
@@ -265,11 +265,11 @@ IF(BUILD_MEGAGLEST)
MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.") MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.")
add_custom_target(${TARGET_NAME_MANPAGE} ALL 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 ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME}
DEPENDS ${TARGET_NAME}) DEPENDS ${TARGET_NAME})
ELSE() ELSE()
add_custom_target(${TARGET_NAME_MANPAGE} ALL 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 ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME}
DEPENDS ${TARGET_NAME}) DEPENDS ${TARGET_NAME})
ENDIF() ENDIF()
ENDIF() ENDIF()
@@ -288,7 +288,7 @@ IF(BUILD_MEGAGLEST)
# Installation of the program manpage file # Installation of the program manpage file
INSTALL(FILES INSTALL(FILES
"${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}" "${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE}"
DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH}) DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
ENDIF() ENDIF()

281
source/glest_game/main/main.cpp
View File

File diff suppressed because it is too large Load Diff

12
source/glest_map_editor/CMakeLists.txt
View File

@@ -114,9 +114,9 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR)
OPTION(WANT_DEV_OUTPATH "use developer friendly output paths" OFF) OPTION(WANT_DEV_OUTPATH "use developer friendly output paths" OFF)
IF(WANT_DEV_OUTPATH) IF(WANT_DEV_OUTPATH)
IF(UNIX AND NOT APPLE) IF(UNIX AND NOT APPLE)
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/mk/linux) SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/mk/linux/)
ELSE() ELSE()
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game) SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game/)
ENDIF() ENDIF()
ENDIF() ENDIF()
@@ -149,7 +149,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR)
TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS}) TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
IF(EXISTS ${HELP2MAN}) 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 [${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE}]")
SET(MG_MANPAGE_DESCRIPTION "Map editor for the popular 3D realtime stragegy game") SET(MG_MANPAGE_DESCRIPTION "Map editor for the popular 3D realtime stragegy game")
@@ -157,11 +157,11 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR)
MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.") MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.")
add_custom_target(${TARGET_NAME_MANPAGE} ALL 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 ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME}
DEPENDS ${TARGET_NAME}) DEPENDS ${TARGET_NAME})
ELSE() ELSE()
add_custom_target(${TARGET_NAME_MANPAGE} ALL 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 ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME}
DEPENDS ${TARGET_NAME}) DEPENDS ${TARGET_NAME})
ENDIF() ENDIF()
ENDIF() ENDIF()
@@ -179,7 +179,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR)
# Installation of the program manpage file # Installation of the program manpage file
INSTALL(FILES INSTALL(FILES
"${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}" "${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME_MANPAGE}"
DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH}) DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
ENDIF() ENDIF()

8
source/tests/CMakeLists.txt
View File

@@ -135,9 +135,9 @@ IF(BUILD_MEGAGLEST_TESTS)
OPTION(WANT_DEV_OUTPATH "use developer friendly output paths" OFF) OPTION(WANT_DEV_OUTPATH "use developer friendly output paths" OFF)
IF(WANT_DEV_OUTPATH) IF(WANT_DEV_OUTPATH)
IF(UNIX AND NOT APPLE) IF(UNIX AND NOT APPLE)
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/mk/linux) SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/mk/linux/)
ELSE() ELSE()
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game) SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game/)
ENDIF() ENDIF()
ENDIF() ENDIF()
@@ -163,12 +163,12 @@ IF(BUILD_MEGAGLEST_TESTS)
MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} will run tests with it.") MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} will run tests with it.")
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME} COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME}
COMMENT "***-- Found megaglest test runner: ${TARGET_NAME} about to run unit tests via xvfb...") COMMENT "***-- Found megaglest test runner: ${TARGET_NAME} about to run unit tests via xvfb...")
ELSE() ELSE()
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
COMMAND ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME} COMMAND ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME}
COMMENT "***-- Found megaglest test runner: ${TARGET_NAME} about to run unit tests...") COMMENT "***-- Found megaglest test runner: ${TARGET_NAME} about to run unit tests...")
ENDIF() ENDIF()