ktutorial-commits

[Ktutorial-commits] SF.net SVN: ktutorial:[227] trunk/ktutorial/ktutorial-editor/src/CMakeLists .txt

[<dan...@us...>]

Revision: 227
          http://ktutorial.svn.sourceforge.net/ktutorial/?rev=227&view=rev
Author:   danxuliu
Date:     2010-04-01 03:46:38 +0000 (Thu, 01 Apr 2010)

Log Message:
-----------
Rename ktutorial-editor.desktop to ktutorial_editor.desktop when it is installed. It seems that "-" is used internally when creating ids for the desktop files to represent a directory, so having "-" in the name confuses the system and as result there is no entry for the desktop file in the menu.

Modified Paths:
--------------
    trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt

Modified: trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt
===================================================================
--- trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt	2010-03-31 16:27:52 UTC (rev 226)
+++ trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt	2010-04-01 03:46:38 UTC (rev 227)
@@ -34,5 +34,10 @@
 ####### Install the editor #######
 
 install(TARGETS ktutorial-editor DESTINATION ${BIN_INSTALL_DIR})
-install(FILES ktutorial-editor.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+# Desktop files should not contain "-" in their name, as it could confuse the
+# desktop id system:
+# http://standards.freedesktop.org/menu-spec/latest/go01.html#term-desktop-file-id
+install(FILES ktutorial-editor.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}
+        RENAME ktutorial_editor.desktop
+)
 install(FILES ktutorial-editorui.rc DESTINATION ${DATA_INSTALL_DIR}/ktutorial-editor)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ktutorial-commits] SF.net SVN: ktutorial:[371] trunk/ktutorial/ktutorial-editor/src/CMakeLists .txt

[<dan...@us...>]

Revision: 371
          http://ktutorial.svn.sourceforge.net/ktutorial/?rev=371&view=rev
Author:   danxuliu
Date:     2012-08-15 02:08:03 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
Change file missed in previous commit (#370).

Modified Paths:
--------------
    trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt

Modified: trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt
===================================================================
--- trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt	2012-08-15 00:58:48 UTC (rev 370)
+++ trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt	2012-08-15 02:08:03 UTC (rev 371)
@@ -16,7 +16,12 @@
 # of the library.
 if(ktutorial-library_BINARY_DIR)
     set(KTUTORIAL_FOUND TRUE)
-    include_directories(${ktutorial-library_BINARY_DIR}/includes)
+    # Include the headers from the build directory before the general includes
+    # to ensure that, even if the KTutorial headers were installed, the ones
+    # from the build directory (and, thus, the most updated ones) are used.
+    # Not really necessary here, as the editor uses KDE4Defaults, and they set
+    # CMAKE_INCLUDE_DIRECTORIES_BEFORE to ON, but just in case this changes.
+    include_directories(BEFORE ${ktutorial-library_BINARY_DIR}/includes)
     set(KTUTORIAL_LIBRARIES ktutorial)
 endif(ktutorial-library_BINARY_DIR)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.