kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tests/Contracts: Fix failing VTK Contract test 

This test was failing because it was attempting to build VTK in the
wrong directory.
This commit is contained in:
Zack Galbreath 2013-12-06 17:02:56 -05:00 committed by Brad King
parent 1b173f25b4
commit ca9e11727b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Tests/Contracts/VTK/CMakeLists.txt
View File

@ -25,7 +25,6 @@ if(NOT DEFINED HOME)
endif() endif()
set(base_dir "${HOME}/.cmake/Contracts/VTK") set(base_dir "${HOME}/.cmake/Contracts/VTK")
set(stamp_dir "${base_dir}/stamp")
if(NOT DEFINED SITE) if(NOT DEFINED SITE)
site_name(SITE) site_name(SITE)
@ -41,7 +40,7 @@ configure_file(
ExternalProject_Add(${PROJECT_NAME} ExternalProject_Add(${PROJECT_NAME}
GIT_REPOSITORY "git://vtk.org/VTK.git" GIT_REPOSITORY "git://vtk.org/VTK.git"
GIT_TAG "release" GIT_TAG "release"
STAMP_DIR ${stamp_dir} PREFIX ${base_dir}
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND ${CMAKE_CTEST_COMMAND} -S "${base_dir}/Dashboard.cmake" BUILD_COMMAND ${CMAKE_CTEST_COMMAND} -S "${base_dir}/Dashboard.cmake"
INSTALL_COMMAND "" INSTALL_COMMAND ""

4
Tests/Contracts/VTK/Dashboard.cmake.in
View File

@ -1,7 +1,7 @@
set(CTEST_SITE "@SITE@") set(CTEST_SITE "@SITE@")
set(CTEST_BUILD_NAME "Contracts.VTK") set(CTEST_BUILD_NAME "Contracts.VTK")
set(CTEST_DASHBOARD_ROOT "@base_dir@") 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_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/VTK-build")
set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@") set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
@ -24,5 +24,5 @@ file(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
ctest_start(Nightly) ctest_start(Nightly)
ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}") ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}")
ctest_build(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}") ctest_submit(BUILD "${CTEST_BINARY_DIRECTORY}")