[Cmake-commits] CMake branch, next, updated. v2.8.7-2373-g0e4fa10

[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  0e4fa1002267cb6bff93c75244732f913bb487a1 (commit)
       via  a94ef02c6e5d524a46f11d224b8b373545ea1534 (commit)
      from  e66b988dba2dea5206cce8eb91f28d17c1708ce0 (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=0e4fa1002267cb6bff93c75244732f913bb487a1
commit 0e4fa1002267cb6bff93c75244732f913bb487a1
Merge: e66b988 a94ef02
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Jan 30 20:42:37 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 20:42:37 2012 -0500

    Merge topic 'update-nightly-cmake-qt-version-again' into next
    
    a94ef02 Update dashmacmini2 release script to use Qt 4.8.0


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a94ef02c6e5d524a46f11d224b8b373545ea1534
commit a94ef02c6e5d524a46f11d224b8b373545ea1534
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Jan 30 20:40:42 2012 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon Jan 30 20:40:42 2012 -0500

    Update dashmacmini2 release script to use Qt 4.8.0

diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake
index 522ee76..3e6b049 100644
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ b/Utilities/Release/dashmacmini2_release.cmake
@@ -12,7 +12,7 @@ CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
 CPACK_SYSTEM_NAME:STRING=Darwin-universal
 BUILD_QtDialog:BOOL=TRUE
-QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Dashboards/Support/qt-4.6.3/bin/bin/qmake
+QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Support/qt-4.8.0/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 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake