diff options
| author | David Cole <david.cole@kitware.com> | 2011-09-16 19:48:41 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2011-09-16 19:48:41 (GMT) |
| commit | d5a0dc4f521310d8e4d2bea411e14f7102a3a35f (patch) | |
| tree | 2a1057689f453fcdf20087a25fe5a3ff37f2982d /Utilities | |
| parent | ec0f23515f92fbdb0f887f6e44c897080e9defd0 (diff) | |
| download | CMake-d5a0dc4f521310d8e4d2bea411e14f7102a3a35f.zip CMake-d5a0dc4f521310d8e4d2bea411e14f7102a3a35f.tar.gz CMake-d5a0dc4f521310d8e4d2bea411e14f7102a3a35f.tar.bz2 | |
Release Scripts: Use Qt 4.7.4 on dashmacmini5 (#12460)
Also, since dashmacmini5 is newer/faster/better and is also building
the source tarballs, remove that responsibility from the dashmacmini2
script.
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/Release/dashmacmini2_release.cmake | 1 | ||||
| -rw-r--r-- | Utilities/Release/dashmacmini5_release.cmake | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake index 2668d38..115181d 100644 --- a/Utilities/Release/dashmacmini2_release.cmake +++ b/Utilities/Release/dashmacmini2_release.cmake @@ -6,7 +6,6 @@ set(HOST dashmacmini2) set(MAKE_PROGRAM "make") set(MAKE "${MAKE_PROGRAM} -j2") set(CPACK_BINARY_GENERATORS "PackageMaker TGZ TZ") -set(CPACK_SOURCE_GENERATORS "TGZ TZ") set(INITIAL_CACHE " CMAKE_BUILD_TYPE:STRING=Release CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386 diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/dashmacmini5_release.cmake index 92eebd7..9bb3a98 100644 --- a/Utilities/Release/dashmacmini5_release.cmake +++ b/Utilities/Release/dashmacmini5_release.cmake @@ -14,7 +14,7 @@ CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.5 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE CPACK_SYSTEM_NAME:STRING=Darwin64-universal BUILD_QtDialog:BOOL=TRUE -QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Support/qt-4.6.4/install/bin/qmake +QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Support/qt-4.7.4/install/bin/qmake ") get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) include(${path}/release_cmake.cmake) |