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 d85206a21fcdeec9995d92530f5c66cf9ffd601b (commit) via ca9e11727b697be364200b5fd8b45bf7ad6f6f7b (commit) from ebe82f456fb79bc321aee307ee24da4b735095f2 (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=d85206a21fcdeec9995d92530f5c66cf9ffd601b commit d85206a21fcdeec9995d92530f5c66cf9ffd601b Merge: ebe82f4 ca9e117 Author: Brad King <brad.k...@kitware.com> AuthorDate: Mon Dec 9 10:28:09 2013 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Dec 9 10:28:09 2013 -0500 Merge topic 'vtk-contract' into next ca9e117 Tests/Contracts: Fix failing VTK Contract test http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca9e11727b697be364200b5fd8b45bf7ad6f6f7b commit ca9e11727b697be364200b5fd8b45bf7ad6f6f7b Author: Zack Galbreath <zack.galbre...@kitware.com> AuthorDate: Fri Dec 6 17:02:56 2013 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Mon Dec 9 10:27:55 2013 -0500 Tests/Contracts: 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: hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits