OSDN Git Service

ensure that full paths are used in .desktop files
authorIvailo Monev <xakepa10@laimg.moc>
Wed, 10 Aug 2016 16:02:56 +0000 (16:02 +0000)
committerIvailo Monev <xakepa10@laimg.moc>
Wed, 10 Aug 2016 16:02:56 +0000 (16:02 +0000)
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
src/tools/designer/CMakeLists.txt
src/tools/qdbusviewer/CMakeLists.txt

index bf7c7b1..b5c4f56 100644 (file)
@@ -95,6 +95,12 @@ if(UNIX AND NOT ${KATIE_PLATFORM} STREQUAL "mac")
     )
 endif()
 
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/designer.desktop.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/designer.desktop
+    @ONLY
+)
+
 katie_resources(${DESIGNERBIN_SOURCES} ${DESIGNERBIN_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -113,11 +119,6 @@ install(
 )
 
 if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)")
-    configure_file(
-        ${CMAKE_CURRENT_SOURCE_DIR}/designer.desktop.cmake
-        ${CMAKE_CURRENT_BINARY_DIR}/designer.desktop
-        @ONLY
-    )
     install(
         PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/designer.desktop
         DESTINATION ${APPLICATIONS_INSTALL_PATH}
index cd488b8..adc9ede 100644 (file)
@@ -37,6 +37,12 @@ if(KATIE_PLATFORM MATCHES "(win32|wince)")
     )
 endif()
 
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/qdbusviewer.desktop.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/qdbusviewer.desktop
+    @ONLY
+)
+
 katie_resources(${QDBUSVIEWER_SOURCES} ${QDBUSVIEWER_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -55,11 +61,6 @@ install(
 )
 
 if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)")
-    configure_file(
-        ${CMAKE_CURRENT_SOURCE_DIR}/qdbusviewer.desktop.cmake
-        ${CMAKE_CURRENT_BINARY_DIR}/qdbusviewer.desktop
-        @ONLY
-    )
     install(
         PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/qdbusviewer.desktop
         DESTINATION ${APPLICATIONS_INSTALL_PATH}