From a133e82eeb61c30a28e7fc4651ded70fe2cbbe08 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Fri, 13 Nov 2015 23:06:54 -0500 Subject: [PATCH] Update CubicSDR.desktop to inerit CMAKE_INSTALL_PREFIX --- CMakeLists.txt | 17 ++++++++++++----- CubicSDR.desktop => cmake/CubicSDR.desktop.in | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) rename CubicSDR.desktop => cmake/CubicSDR.desktop.in (77%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5862d6..c3ce07b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -647,7 +647,11 @@ IF (UNIX AND NOT APPLE AND BUILD_DEB) set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro") - CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/external/deb/deb_post.sh.in" "${CMAKE_CURRENT_BINARY_DIR}/deb_post.sh" @ONLY IMMEDIATE) + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/external/deb/deb_post.sh.in" + "${CMAKE_CURRENT_BINARY_DIR}/deb_post.sh" @ONLY IMMEDIATE) + + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CubicSDR.desktop.in" + "${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.desktop" @ONLY IMMEDIATE) INSTALL(TARGETS CubicSDR DESTINATION bin) install(FILES @@ -655,7 +659,7 @@ IF (UNIX AND NOT APPLE AND BUILD_DEB) ${PROJECT_SOURCE_DIR}/src/CubicSDR.png DESTINATION share/cubicsdr) - INSTALL(FILES CubicSDR.desktop + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.desktop" DESTINATION share/applications) INCLUDE(CPack) @@ -670,17 +674,20 @@ IF(UNIX AND NOT APPLE AND NOT BUILD_DEB) set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro") + + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CubicSDR.desktop.in" + "${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.desktop" @ONLY IMMEDIATE) INSTALL(TARGETS CubicSDR DESTINATION bin) install(FILES ${CUBICSDR_RESOURCES} ${PROJECT_SOURCE_DIR}/src/CubicSDR.png DESTINATION share/cubicsdr) - INSTALL(FILES CubicSDR.desktop + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.desktop" DESTINATION share/applications) - CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/external/deb/deb_post.sh.in" "${CMAKE_CURRENT_BINARY_DIR}/deb_post.sh" @ONLY IMMEDIATE) - + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/external/deb/deb_post.sh.in" + "${CMAKE_CURRENT_BINARY_DIR}/deb_post.sh" @ONLY IMMEDIATE) CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" diff --git a/CubicSDR.desktop b/cmake/CubicSDR.desktop.in similarity index 77% rename from CubicSDR.desktop rename to cmake/CubicSDR.desktop.in index 6cb140c..6d33ae4 100644 --- a/CubicSDR.desktop +++ b/cmake/CubicSDR.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Exec=CubicSDR %u -Icon=/usr/share/cubicsdr/CubicSDR.png +Icon=@CMAKE_INSTALL_PREFIX@/share/cubicsdr/CubicSDR.png Terminal=false Name=CubicSDR GenericName=CubicSDR