diff options
| author | Brad King <brad.king@kitware.com> | 2013-12-09 10:35:58 -0500 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-12-09 10:35:58 -0500 |
| commit | 330af68ed4eca375160b31aefd71bd6ea11b586f (patch) | |
| tree | 8a204fc51bdb6b52b7188b449de099fae1dacc22 | |
| parent | 5026696fcc79e1ec4b1f40069566614852b4c312 (diff) | |
| parent | ca9e11727b697be364200b5fd8b45bf7ad6f6f7b (diff) | |
| download | cmake-330af68ed4eca375160b31aefd71bd6ea11b586f.tar.gz | |
Merge topic 'vtk-contract'
ca9e117 Tests/Contracts: Fix failing VTK Contract test
| -rw-r--r-- | Tests/Contracts/VTK/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/Contracts/VTK/Dashboard.cmake.in | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Tests/Contracts/VTK/CMakeLists.txt b/Tests/Contracts/VTK/CMakeLists.txt index 5b19f016cb..ef19325a47 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 b10f3848c0..e33a2de798 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}") |