kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Clinton Stimpson 2007-11-06 23:00:23 -05:00
parent 768680f4d5
commit 00cfa0ebed
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/QtDialog/CMakeLists.txt
View File

@ -28,10 +28,15 @@ ELSE(NOT QT4_FOUND)
QT4_ADD_RESOURCES(RC_SRCS CMakeSetup.qrc) QT4_ADD_RESOURCES(RC_SRCS CMakeSetup.qrc)
SET(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS}) SET(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
IF(WIN32) IF(Q_WS_WIN)
SET(SRCS ${SRCS} CMakeSetup.rc) SET(SRCS ${SRCS} CMakeSetup.rc)
ENDIF(WIN32) ENDIF(Q_WS_WIN)
# TODO Mac OS X icon 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_BINARY_DIR})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})

BIN
Source/QtDialog/CMakeSetup.icns Normal file
View File

Binary file not shown.

3
Source/QtDialog/QCMake.cxx
View File

@ -35,7 +35,8 @@ QCMake::QCMake(QObject* p)
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
this->CMakeExecutable = appDir.filePath("cmake.exe"); this->CMakeExecutable = appDir.filePath("cmake.exe");
#elif defined(Q_OS_MAC) #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 #else
this->CMakeExecutable = appDir.filePath("cmake"); this->CMakeExecutable = appDir.filePath("cmake");
#endif #endif