[Uml-devel] KDE/kdesdk

[David Faure]

SVN commit 1188169 by dfaure:

Make executable the Type=Application .desktop files we install,
so that they can be used even from a KDE running in another prefix (http://markmail.org/message/4p3krovtnzwx35zd)


 M  +1 -1      doc/scripts/kdesrc-build/CMakeLists.txt  
 M  +1 -1      kapptemplate/templates/C++/kapp4/src/CMakeLists.txt  
 M  +2 -2      kapptemplate/templates/C++/kpartapp/src/CMakeLists.txt  
 M  +1 -1      kapptemplate/templates/ruby/kderubyapp/src/CMakeLists.txt  
 M  +1 -1      umbrello/umbrello/CMakeLists.txt  


--- trunk/KDE/kdesdk/doc/scripts/kdesrc-build/CMakeLists.txt #1188168:1188169
@@ -1,5 +1,5 @@
 ########### install files ###############
 kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
 
-install( FILES kdesrc-build.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
+install( PROGRAMS kdesrc-build.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
 
--- trunk/KDE/kdesdk/kapptemplate/templates/C++/kapp4/src/CMakeLists.txt #1188168:1188169
@@ -17,6 +17,6 @@
 
 ########### install files ###############
 
-install( FILES %{APPNAMELC}.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( PROGRAMS %{APPNAMELC}.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR} )
 install( FILES %{APPNAMELC}.kcfg  DESTINATION  ${KCFG_INSTALL_DIR} )
 install( FILES %{APPNAMELC}ui.rc  DESTINATION  ${DATA_INSTALL_DIR}/%{APPNAMELC} )
--- trunk/KDE/kdesdk/kapptemplate/templates/C++/kpartapp/src/CMakeLists.txt #1188168:1188169
@@ -9,7 +9,7 @@
 
 ########### install files ###############
 install(TARGETS %{APPNAMELC} ${INSTALL_TARGETS_DEFAULT_ARGS} )
-install( FILES %{APPNAMELC}.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
+install( PROGRAMS %{APPNAMELC}.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
 install( FILES %{APPNAMELC}_shell.rc  DESTINATION  ${DATA_INSTALL_DIR}/%{APPNAMELC} )
 
 
@@ -25,7 +25,7 @@
 
 target_link_libraries(%{APPNAMELC}part ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} )
 
-install( FILES %{APPNAMELC}_part.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( PROGRAMS %{APPNAMELC}_part.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR} )
 install( FILES %{APPNAMELC}_part.rc  DESTINATION  ${DATA_INSTALL_DIR}/%{APPNAMELC}part )
 
 install(TARGETS %{APPNAMELC}part  DESTINATION ${PLUGIN_INSTALL_DIR} )
--- trunk/KDE/kdesdk/kapptemplate/templates/ruby/kderubyapp/src/CMakeLists.txt #1188168:1188169
@@ -17,7 +17,7 @@
         add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ui_%{APPNAMELC}view_base.rb COMMAND ${RBUIC4} -tr KDE::tr2i18n ${UI_%{APPNAMEUC}_VIEW_BASE} -o ${CMAKE_CURRENT_BINARY_DIR}/ui_%{APPNAMELC}view_base.rb COMMENT "Generating ui_%{APPNAMELC}view_base.rb")
         add_custom_target(%{APPNAMELC}view_base ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ui_%{APPNAMELC}view_base.rb)
 
-        install( FILES %{APPNAMELC}.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR} )
+        install( PROGRAMS %{APPNAMELC}.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR} )
         install( FILES %{APPNAMELC}ui.rc  DESTINATION  ${DATA_INSTALL_DIR}/%{APPNAMELC} )
 
         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ui_prefs_base.rb DESTINATION ${DATA_INSTALL_DIR}/%{APPNAMELC})
--- trunk/KDE/kdesdk/umbrello/umbrello/CMakeLists.txt #1188168:1188169
@@ -437,7 +437,7 @@
 
 ########### install files ###############
 
-install( FILES umbrello.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
+install( PROGRAMS umbrello.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
 install( FILES
     umbrelloui.rc
     docgenerators/xmi2docbook.xsl