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.
This commit is contained in:
David Cole 2011-09-16 15:48:41 -04:00
parent ec0f23515f
commit d5a0dc4f52
2 changed files with 1 additions and 2 deletions

View File

@ -6,7 +6,6 @@ set(HOST dashmacmini2)
set(MAKE_PROGRAM "make") set(MAKE_PROGRAM "make")
set(MAKE "${MAKE_PROGRAM} -j2") set(MAKE "${MAKE_PROGRAM} -j2")
set(CPACK_BINARY_GENERATORS "PackageMaker TGZ TZ") set(CPACK_BINARY_GENERATORS "PackageMaker TGZ TZ")
set(CPACK_SOURCE_GENERATORS "TGZ TZ")
set(INITIAL_CACHE " set(INITIAL_CACHE "
CMAKE_BUILD_TYPE:STRING=Release CMAKE_BUILD_TYPE:STRING=Release
CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386 CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386

View File

@ -14,7 +14,7 @@ CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.5
CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
CPACK_SYSTEM_NAME:STRING=Darwin64-universal CPACK_SYSTEM_NAME:STRING=Darwin64-universal
BUILD_QtDialog:BOOL=TRUE 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) get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
include(${path}/release_cmake.cmake) include(${path}/release_cmake.cmake)