Freedesktop: don't hardcode binary path in .desktop file.

2016-06-23 11:25:57 +00:00 · 2016-06-23 11:25:57 +00:00 · 5c754bd994
parent 51f4f27b2b
commit 5c754bd994
2 changed files with 5 additions and 2 deletions
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@ -120,7 +120,10 @@ elseif(APPLE)
 else()
    add_resource(freedesktop/solvespace-48x48.png)

-    install(FILES freedesktop/solvespace.desktop
+    configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/freedesktop/solvespace.desktop.in
+        ${CMAKE_CURRENT_BINARY_DIR}/freedesktop/solvespace.desktop)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freedesktop/solvespace.desktop
        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)

    foreach(SIZE 16x16 24x24 32x32 48x48)
--- a/res/freedesktop/solvespace.desktop.in
+++ b/res/freedesktop/solvespace.desktop.in
@ -2,7 +2,7 @@
 Version=1.0
 Name=SolveSpace
 Comment=A parametric 2d/3d CAD
-Exec=/usr/bin/solvespace
+Exec=${CMAKE_INSTALL_FULL_BINDIR}/solvespace
 Icon=solvespace
 Type=Application
 Categories=Graphics