[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6103-gdf3e565

[Zack Galbreath]

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  df3e56586d47d1317be3115e068080fbc6436ee0 (commit)
       via  5b992018cf7c51c57068edf4b965eab4d65c76ba (commit)
      from  5b76b26287946fbbdc38f8b973d63746c7ad0f76 (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=df3e56586d47d1317be3115e068080fbc6436ee0
commit df3e56586d47d1317be3115e068080fbc6436ee0
Merge: 5b76b26 5b99201
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Fri Dec 6 17:06:19 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 6 17:06:19 2013 -0500

    Merge topic 'vtk-contract' into next
    
    5b99201 fix failing VTK Contract test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b992018cf7c51c57068edf4b965eab4d65c76ba
commit 5b992018cf7c51c57068edf4b965eab4d65c76ba
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Fri Dec 6 17:02:56 2013 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Fri Dec 6 17:05:03 2013 -0500

    fix failing VTK Contract test
    
    This test was failing because it was attempting to build VTK in the
    wrong directory.

diff --git a/Tests/Contracts/VTK/CMakeLists.txt b/Tests/Contracts/VTK/CMakeLists.txt
index 5b19f01..ef19325 100644
--- a/Tests/Contracts/VTK/CMakeLists.txt
+++ b/Tests/Contracts/VTK/CMakeLists.txt
@@ -25,7 +25,6 @@ if(NOT DEFINED HOME)
 endif()
 
 set(base_dir "${HOME}/.cmake/Contracts/VTK")
-set(stamp_dir "${base_dir}/stamp")
 
 if(NOT DEFINED SITE)
   site_name(SITE)
@@ -41,7 +40,7 @@ configure_file(
 ExternalProject_Add(${PROJECT_NAME}
   GIT_REPOSITORY "git://vtk.org/VTK.git"
   GIT_TAG "release"
-  STAMP_DIR ${stamp_dir}
+  PREFIX ${base_dir}
   CONFIGURE_COMMAND ""
   BUILD_COMMAND ${CMAKE_CTEST_COMMAND} -S "${base_dir}/Dashboard.cmake"
   INSTALL_COMMAND ""
diff --git a/Tests/Contracts/VTK/Dashboard.cmake.in b/Tests/Contracts/VTK/Dashboard.cmake.in
index b10f384..e33a2de 100644
--- a/Tests/Contracts/VTK/Dashboard.cmake.in
+++ b/Tests/Contracts/VTK/Dashboard.cmake.in
@@ -1,7 +1,7 @@
 set(CTEST_SITE "@SITE@")
 set(CTEST_BUILD_NAME "Contracts.VTK")
 set(CTEST_DASHBOARD_ROOT "@base_dir@")
-set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/VTK")
+set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/src/VTK")
 set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/VTK-build")
 
 set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
@@ -24,5 +24,5 @@ file(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
 ctest_start(Nightly)
 ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}")
 ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}")
-ctest_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" INCLUDE "PythonSmoke")
+ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" INCLUDE "PythonSmoke")
 ctest_submit(BUILD "${CTEST_BINARY_DIRECTORY}")

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

Summary of changes:
 Tests/Contracts/VTK/CMakeLists.txt     |    3 +--
 Tests/Contracts/VTK/Dashboard.cmake.in |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake