[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/utils/charm/trunk/Charm
From:       Sebastian Sauer <mail () dipe ! org>
Date:       2009-02-11 22:40:10
Message-ID: 1234392010.983878.680.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 924920 by sebsauer:

* compile also at linux again :)
* install the Charm app into $prefix/bin rather then $prefix
* install a desktop-file to let Charm show up in e.g. kickoff
  and krunner
* install the charm-icon as well



 M  +2 -0      Application.cpp  
 M  +10 -1     CMakeLists.txt  
 A             Charm.desktop  


--- trunk/playground/utils/charm/trunk/Charm/Application.cpp #924919:924920
@@ -25,6 +25,8 @@
 #include "ConfigurationDialog.h"
 #include "Idle/IdleDetector.h"
 
+#include <algorithm> //for_each()
+
 Application* Application::m_instance = 0;
 
 #if defined Q_WS_MAC
--- trunk/playground/utils/charm/trunk/Charm/CMakeLists.txt #924919:924920
@@ -155,8 +155,17 @@
     	MESSAGE( "Linking static Qt JPG plugin for this static build." )
     ENDIF( CHARM_BUILD_STATIC_QT )
     MESSAGE( "Charm will be installed to ${CMAKE_INSTALL_PREFIX}" )
-    INSTALL( TARGETS Charm DESTINATION ${CMAKE_INSTALL_PREFIX} )
 
+    IF( UNIX )
+        SET( XDG_APPS_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/applications )
+        SET( ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/icons )
+        INSTALL( FILES Charm.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+        INSTALL( FILES Icons/Charm-128x128.png DESTINATION ${ICON_INSTALL_DIR} )
+        INSTALL( TARGETS Charm DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
+    ELSE( UNIX )
+        INSTALL( TARGETS Charm DESTINATION ${CMAKE_INSTALL_PREFIX} )
+    ENDIF( UNIX )
+
 ENDIF ( QT4_FOUND )
 
 IF ( NOT QT4_FOUND )
[prev in list] [next in list] [prev in thread] [next in thread]