From cb38ea6fa564b73311373e2c2aa330b82ad74dbf Mon Sep 17 00:00:00 2001 From: Ludovic Hussonnois <ludovic.hussonnois@c-s.fr> Date: Mon, 6 Feb 2017 09:26:20 +0100 Subject: [PATCH] ENH: Mantis-1355 : Apply patch to set OTB_APPLICATION_PATH environment variable in monteverdi desktop file --- Modules/Visualization/MonteverdiGui/CMakeLists.txt | 3 ++- Utilities/Data/{monteverdi.desktop => monteverdi.desktop.in} | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) rename Utilities/Data/{monteverdi.desktop => monteverdi.desktop.in} (70%) diff --git a/Modules/Visualization/MonteverdiGui/CMakeLists.txt b/Modules/Visualization/MonteverdiGui/CMakeLists.txt index 37f9984e1d..d503daf285 100644 --- a/Modules/Visualization/MonteverdiGui/CMakeLists.txt +++ b/Modules/Visualization/MonteverdiGui/CMakeLists.txt @@ -42,7 +42,8 @@ if (UNIX AND NOT APPLE) # ------------------------- # Install freedesktop entry - install(FILES ${OTBMonteverdiGUI_DATA_DIR}/monteverdi.desktop + configure_file(${OTBMonteverdiGUI_DATA_DIR}/monteverdi.desktop.in ${CMAKE_BINARY_DIR}/monteverdi.desktop) + install(FILES ${CMAKE_BINARY_DIR}/monteverdi.desktop DESTINATION share/applications) endif() diff --git a/Utilities/Data/monteverdi.desktop b/Utilities/Data/monteverdi.desktop.in similarity index 70% rename from Utilities/Data/monteverdi.desktop rename to Utilities/Data/monteverdi.desktop.in index 2e791673b9..ee8b5f1a2b 100644 --- a/Utilities/Data/monteverdi.desktop +++ b/Utilities/Data/monteverdi.desktop.in @@ -4,8 +4,8 @@ Name=Monteverdi Name[fr_FR]=Monteverdi GenericName=Image processing Comment=Remote sensing image processing application based on OrfeoToolbox -TryExec=/usr/bin/monteverdi -Exec=/usr/bin/monteverdi %F +TryExec=@CMAKE_INSTALL_PREFIX@/bin/monteverdi +Exec=env OTB_APPLICATION_PATH=@CMAKE_INSTALL_PREFIX@/@OTB_INSTALL_APP_DIR@ @CMAKE_INSTALL_PREFIX@/bin/monteverdi %F Terminal=false StartupNotify=false Icon=monteverdi -- GitLab