[Cmake-commits] CMake branch, next, updated. v2.8.1-1261-g3a796f0

[cmake-commits at cmake.org]

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  3a796f0dc10069e79dba0cb9dfa50fbc986b2b04 (commit)
       via  aa4daa528e76494b25e7fd1e5960af7a806c5bdc (commit)
       via  e6efd9ac0a0e38208162d32e5d45849337ab39e4 (commit)
      from  c81d128e2a18bd95b1f75b0315cbb6fa4e8e86b6 (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=3a796f0dc10069e79dba0cb9dfa50fbc986b2b04
commit 3a796f0dc10069e79dba0cb9dfa50fbc986b2b04
Merge: c81d128 aa4daa5
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date:   Fri May 28 17:54:50 2010 -0400

    Merge branch 'update_release_scripts' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa4daa528e76494b25e7fd1e5960af7a806c5bdc
commit aa4daa528e76494b25e7fd1e5960af7a806c5bdc
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date:   Fri May 28 17:53:26 2010 -0400

    change nightly release builds to use next, and move qmake on dash2win64

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 330cf9f..25f7ade 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -270,7 +270,7 @@ IF(BUILD_TESTING)
     FILE(MAKE_DIRECTORY "${_TEST_DIR}")
     FILE(WRITE "${_TEST_DIR}/nightly-cmake.sh"
       "cd ${_TEST_DIR}
-${CMake_BINARY_DIR}/bin/cmake -DCMAKE_CREATE_VERSION=master -P ${CMake_SOURCE_DIR}/Utilities/Release/${script}
+${CMake_BINARY_DIR}/bin/cmake -DCMAKE_CREATE_VERSION=next -P ${CMake_SOURCE_DIR}/Utilities/Release/${script}
 ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/Release/upload_release.cmake
     ")
     ADD_TEST(${name} /bin/sh ${_TEST_DIR}/nightly-cmake.sh)
diff --git a/Utilities/Release/dash2win64_release.cmake b/Utilities/Release/dash2win64_release.cmake
index fcf67bc..94decdd 100644
--- a/Utilities/Release/dash2win64_release.cmake
+++ b/Utilities/Release/dash2win64_release.cmake
@@ -12,7 +12,7 @@ CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
 CMAKE_Fortran_COMPILER:FILEPATH=FALSE
 CMAKE_GENERATOR:INTERNAL=Unix Makefiles
 BUILD_QtDialog:BOOL:=TRUE
-QT_QMAKE_EXECUTABLE:FILEPATH=c:/Dashboards/Support/qt-4.5.3-static/bin/qmake.exe
+QT_QMAKE_EXECUTABLE:FILEPATH=c:/Dashboards/Support/qt-build/Qt/bin/qmake.exe
 ")
 get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
 set(GIT_COMMAND git)

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

Summary of changes:
 Source/kwsys/kwsysDateStamp.cmake          |    2 +-
 Tests/CMakeLists.txt                       |    2 +-
 Utilities/Release/dash2win64_release.cmake |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake