Merge topic 'vtk-contract'

ca9e117 Tests/Contracts: Fix failing VTK Contract test

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 ""

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}")