[Cmake-commits] CMake branch, next, updated. v2.8.2-879-gdc23a9a

[Bill Hoffman]

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  dc23a9af989d1d437fc331bf588acbdcd3ab4eec (commit)
       via  fd343a1a36c4f6ff62f67acfc5506fb2592858b3 (commit)
      from  9f1109cbd20189e40fdc5ed007efef48fc3c7fdf (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=dc23a9af989d1d437fc331bf588acbdcd3ab4eec
commit dc23a9af989d1d437fc331bf588acbdcd3ab4eec
Merge: 9f1109c fd343a1
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Sep 21 12:01:56 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 21 12:01:56 2010 -0400

    Merge topic 'add_vtk_contract_test' into next
    
    fd343a1 Add a "Contract" test for VTK.  The test downloads and builds VTK.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd343a1a36c4f6ff62f67acfc5506fb2592858b3
commit fd343a1a36c4f6ff62f67acfc5506fb2592858b3
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Sep 21 10:23:09 2010 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Tue Sep 21 10:23:09 2010 -0400

    Add a "Contract" test for VTK.  The test downloads and builds VTK.
    
    The idea is that we can make sure that CMake is staying backwards
    compatible by testing projects against CMake as the changes are made
    in CMake.  Because these tests will take a long time to run, they
    will not be enabled by default.  Instead, they will be enabled by
    putting a cache variable into CMake.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 5e88b5c..82ea48b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -11,7 +11,7 @@ MACRO(ADD_TEST_MACRO NAME COMMAND)
     --build-generator ${CMAKE_TEST_GENERATOR}
     --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
     --build-project ${proj}
-    --test-command ${COMMAND})
+    --test-command ${COMMAND} ${ARGN})
   LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${dir}")
 ENDMACRO(ADD_TEST_MACRO)
 
@@ -1757,6 +1757,15 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     -D source_dir:STRING=${CMAKE_CURRENT_SOURCE_DIR}/Tutorial/Step3
     -D CMAKE_CTEST_COMMAND:STRING=${CMAKE_CTEST_COMMAND}
     -P ${CMAKE_CURRENT_SOURCE_DIR}/CMakeWizardTest.cmake)
+  # If the cache variable CMAKE_CONTRACT_PROJECTS is set
+  # then the dashboard will run a contract with CMake test of that
+  # name.  For example CMAKE_CONTRACT_PROJECTS = vtk542 would run
+  # the vtk542 contract test.
+  FOREACH(project ${CMAKE_CONTRACT_PROJECTS})
+    ADD_TEST_MACRO(Contracts.${project}
+      VTK-build/bin/CommonCxxTests otherArrays)
+    SET_TESTS_PROPERTIES(Contracts.${project} PROPERTIES TIMEOUT 5400)
+  ENDFOREACH()
 ENDIF(BUILD_TESTING)
 
 SUBDIRS(CMakeTests)
diff --git a/Tests/Contracts/vtk542/CMakeLists.txt b/Tests/Contracts/vtk542/CMakeLists.txt
new file mode 100644
index 0000000..cfb8b16
--- /dev/null
+++ b/Tests/Contracts/vtk542/CMakeLists.txt
@@ -0,0 +1,30 @@
+# The VTK external project for CMake
+# ---------------------------------------------------------------------------
+cmake_minimum_required(VERSION 2.8)
+project(vtk542)
+include(ExternalProject)
+
+
+set(vtk_source "${CMAKE_CURRENT_BINARY_DIR}/VTK-source")
+set(vtk_binary "${CMAKE_CURRENT_BINARY_DIR}/VTK-build")
+
+ExternalProject_Add(VTK
+  DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}
+  URL "http://www.vtk.org/files/release/5.4/vtk-5.4.2.tar.gz"
+  URL_MD5 c2c797091d4b2128d9a1bd32c4b78227
+  SOURCE_DIR ${vtk_source}
+  BINARY_DIR ${vtk_binary}
+  CMAKE_GENERATOR  "${CMAKE_GENERATOR}"
+  CMAKE_ARGS
+  -DBUILD_EXAMPLES:BOOL=ON
+  -DBUILD_TESTING:BOOL=ON
+  INSTALL_COMMAND ""
+  )
+# make it so that each build will run make in the VTK build tree
+ExternalProject_Add_Step(VTK forcebuild
+  COMMAND ${CMAKE_COMMAND}
+  -E remove ${CMAKE_CURRENT_BUILD_DIR}/VTK-prefix/src/VTK-stamp/VTK-build
+  DEPENDEES configure
+  DEPENDERS build
+  ALWAYS 1
+  )

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

Summary of changes:
 Tests/CMakeLists.txt                  |   11 ++++++++++-
 Tests/Contracts/vtk542/CMakeLists.txt |   30 ++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletions(-)
 create mode 100644 Tests/Contracts/vtk542/CMakeLists.txt


hooks/post-receive
-- 
CMake