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