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

List:       kde-commits
Subject:    playground/utils/charm/trunk/Charm
From:       Mike Arthur <mike () mikearthur ! co ! uk>
Date:       2010-01-23 17:13:14
Message-ID: 1264266794.311804.27469.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1079111 by mikearthur:

Fixup installed bundle using CMake to add libraries.

 M  +9 -2      CMakeLists.txt  


--- trunk/playground/utils/charm/trunk/Charm/CMakeLists.txt #1079110:1079111
@@ -70,7 +70,7 @@
 #	   MESSAGE(STATUS "DARWIN_VERSION=${DARWIN_VERSION}")
 	   ADD_DEFINITIONS( -DDARWIN_VERSION=${DARWIN_VERSION} )
         ELSE( APPLE AND NOT QT_MAC_USE_COCOA )
-	    IF( UNIX )
+	    IF( UNIX AND NOT APPLE )
                 include(FindX11)
 	        if(X11_FOUND)
 		    INCLUDE_DIRECTORIES( ${X11_INCLUDE_DIR} )
@@ -82,7 +82,7 @@
                         message("Please install libXss-dev to get idle detection to work on Linux")
                     endif(X11_Xscreensaver_LIB)
                 endif(X11_FOUND)
-            ENDIF( UNIX )
+            ENDIF( UNIX AND NOT APPLE )
         ENDIF( APPLE AND NOT QT_MAC_USE_COCOA )
         configure_file(config-charm.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-charm.h )
 
@@ -159,6 +159,13 @@
         INSTALL( TARGETS Charm DESTINATION ${CMAKE_INSTALL_PREFIX} )
     ENDIF( UNIX AND NOT APPLE )
 
+    IF( APPLE )
+	INSTALL( CODE "INCLUDE( BundleUtilities )" )
+	INSTALL( CODE "SET( BUNDLE \"\${CMAKE_INSTALL_PREFIX}/Charm.app\" )" )
+	INSTALL( CODE "FIXUP_BUNDLE( \"\${BUNDLE}\" \"\" \"\" )" )
+	INSTALL( CODE "VERIFY_APP( \"\${BUNDLE}\" )" )
+    ENDIF( APPLE)
+
 ENDIF ( QT4_FOUND )
 
 IF ( NOT QT4_FOUND )
[prev in list] [next in list] [prev in thread] [next in thread]