From b4990de52e6cde1e097e4024e5188cbe99b3137f Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Mon, 29 Oct 2012 21:03:38 +0000 Subject: [PATCH] - bugfix for cmake install for map editor and g3d viewer --- source/g3d_viewer/CMakeLists.txt | 7 ++++++- source/glest_map_editor/CMakeLists.txt | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt index 9101d0a9..09c98d57 100644 --- a/source/g3d_viewer/CMakeLists.txt +++ b/source/g3d_viewer/CMakeLists.txt @@ -189,8 +189,13 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}) # Installation of the program desktop file + SET(MG_DESKTOP_FILE ${PROJECT_SOURCE_DIR}/mk/linux/megaglest_g3dviewer.desktop) + IF(NOT EXISTS ${MG_DESKTOP_FILE}) + SET(MG_DESKTOP_FILE ${PROJECT_SOURCE_DIR}/megaglest_g3dviewer.desktop) + ENDIF() + INSTALL(FILES - "${PROJECT_SOURCE_DIR}/mk/linux/megaglest_g3dviewer.desktop" + "${MG_DESKTOP_FILE}" DESTINATION ${MEGAGLEST_DESKTOP_INSTALL_PATH}) ENDIF() diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt index 4a38ce0f..6e5bc306 100644 --- a/source/glest_map_editor/CMakeLists.txt +++ b/source/glest_map_editor/CMakeLists.txt @@ -184,8 +184,13 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}) # Installation of the program desktop file + SET(MG_DESKTOP_FILE ${PROJECT_SOURCE_DIR}/mk/linux/megaglest_editor.desktop) + IF(NOT EXISTS ${MG_DESKTOP_FILE}) + SET(MG_DESKTOP_FILE ${PROJECT_SOURCE_DIR}/megaglest_editor.desktop) + ENDIF() + INSTALL(FILES - "${PROJECT_SOURCE_DIR}/mk/linux/megaglest_editor.desktop" + "${MG_DESKTOP_FILE}" DESTINATION ${MEGAGLEST_DESKTOP_INSTALL_PATH}) ENDIF()