[cmake-commits] clinton committed CMakeLists.txt 1.3 1.4 CMakeSetup.icns NONE 1.1 QCMake.cxx 1.7 1.8

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv2141

Modified Files:
	CMakeLists.txt QCMake.cxx 
Added Files:
	CMakeSetup.icns 
Log Message:
ENH:  For Mac OSX -- add app icon, and implement find of cmake executable.


--- NEW FILE: CMakeSetup.icns ---
(This appears to be a binary file; contents omitted.)

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeLists.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CMakeLists.txt	3 Nov 2007 14:30:52 -0000	1.3
+++ CMakeLists.txt	7 Nov 2007 04:00:23 -0000	1.4
@@ -28,10 +28,15 @@
   QT4_ADD_RESOURCES(RC_SRCS CMakeSetup.qrc)
 
   SET(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
-  IF(WIN32)
+  IF(Q_WS_WIN)
     SET(SRCS ${SRCS} CMakeSetup.rc)
-  ENDIF(WIN32)
-  # TODO  Mac OS X icon
+  ENDIF(Q_WS_WIN)
+  IF(Q_WS_MAC)
+    SET(SRCS ${SRCS} CMakeSetup.icns)
+    SET(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
+    SET_SOURCE_FILES_PROPERTIES(CMakeSetup.icns PROPERTIES
+      MACOSX_PACKAGE_LOCATION Resources)
+  ENDIF(Q_WS_MAC)
 
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})

Index: QCMake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QCMake.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- QCMake.cxx	7 Nov 2007 00:25:43 -0000	1.7
+++ QCMake.cxx	7 Nov 2007 04:00:23 -0000	1.8
@@ -35,7 +35,8 @@
 #if defined(Q_OS_WIN)
   this->CMakeExecutable = appDir.filePath("cmake.exe");
 #elif defined(Q_OS_MAC)
-# error "need to implement for Mac OS X"
+  appDir.cd("../../../");  // path to cmake in build directory (need to fix for deployment)
+  this->CMakeExecutable = appDir.filePath("cmake");
 #else
   this->CMakeExecutable = appDir.filePath("cmake");
 #endif