浏览代码

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.
David Cole 14 年之前
父节点
当前提交
d5a0dc4f52
共有 2 个文件被更改,包括 1 次插入2 次删除
  1. 0 1
      Utilities/Release/dashmacmini2_release.cmake
  2. 1 1
      Utilities/Release/dashmacmini5_release.cmake

+ 0 - 1
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

+ 1 - 1
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)