[Cmake-commits] CMake branch, next, updated. v2.8.7-2144-g95dd0f2

[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  95dd0f279c9a239b18c8c1f5f30eb94e131cc184 (commit)
       via  7240aa7facabc3f0fc03833ec4d956e982469557 (commit)
      from  68dc34f6f4a8233f935d0e655fa1a6b892b0a59e (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=95dd0f279c9a239b18c8c1f5f30eb94e131cc184
commit 95dd0f279c9a239b18c8c1f5f30eb94e131cc184
Merge: 68dc34f 7240aa7
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Jan 17 18:01:35 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 17 18:01:35 2012 -0500

    Merge topic 'update-dashmacmini2-qt' into next
    
    7240aa7 Update dashmacmini2 release script to use Qt 4.6.3


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7240aa7facabc3f0fc03833ec4d956e982469557
commit 7240aa7facabc3f0fc03833ec4d956e982469557
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Jan 17 17:59:16 2012 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Jan 17 17:59:16 2012 -0500

    Update dashmacmini2 release script to use Qt 4.6.3

diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake
index 115181d..522ee76 100644
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ b/Utilities/Release/dashmacmini2_release.cmake
@@ -5,14 +5,14 @@ set(INSTALL_PREFIX /)
 set(HOST dashmacmini2)
 set(MAKE_PROGRAM "make")
 set(MAKE "${MAKE_PROGRAM} -j2")
-set(CPACK_BINARY_GENERATORS "PackageMaker TGZ TZ") 
+set(CPACK_BINARY_GENERATORS "PackageMaker TGZ TZ")
 set(INITIAL_CACHE "
 CMAKE_BUILD_TYPE:STRING=Release
 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/Software/QtBinUniversal/bin/qmake
+QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Dashboards/Support/qt-4.6.3/bin/bin/qmake
 ")
 get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
 include(${path}/release_cmake.cmake)

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

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


hooks/post-receive
-- 
CMake