[Cmake-commits] CMake branch, next, updated. v2.8.5-1903-g2b694a4

[David Cole]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2b694a457f28a2b7433c38e27daa3041eba6aa83 (commit)
       via  d5a0dc4f521310d8e4d2bea411e14f7102a3a35f (commit)
      from  3af54134b9239de12a1bb91ced41a908fcad83de (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b694a457f28a2b7433c38e27daa3041eba6aa83
commit 2b694a457f28a2b7433c38e27daa3041eba6aa83
Merge: 3af5413 d5a0dc4
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Sep 16 15:51:32 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 16 15:51:32 2011 -0400

    Merge topic 'tweak-release-scripts' into next
    
    d5a0dc4 Release Scripts: Use Qt 4.7.4 on dashmacmini5 (#12460)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5a0dc4f521310d8e4d2bea411e14f7102a3a35f
commit d5a0dc4f521310d8e4d2bea411e14f7102a3a35f
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Sep 16 15:48:41 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Sep 16 15:48:41 2011 -0400

    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.

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)

-----------------------------------------------------------------------

Summary of changes:
 Utilities/Release/dashmacmini2_release.cmake |    1 -
 Utilities/Release/dashmacmini5_release.cmake |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake