Browse Source

ENH: For Mac OSX -- add app icon, and implement find of cmake executable.

Clinton Stimpson 18 years ago
parent
commit
00cfa0ebed
3 changed files with 10 additions and 4 deletions
  1. 8 3
      Source/QtDialog/CMakeLists.txt
  2. BIN
      Source/QtDialog/CMakeSetup.icns
  3. 2 1
      Source/QtDialog/QCMake.cxx

+ 8 - 3
Source/QtDialog/CMakeLists.txt

@@ -28,10 +28,15 @@ ELSE(NOT QT4_FOUND)
   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})

BIN
Source/QtDialog/CMakeSetup.icns


+ 2 - 1
Source/QtDialog/QCMake.cxx

@@ -35,7 +35,8 @@ QCMake::QCMake(QObject* p)
 #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