[Cmake-commits] [cmake-commits] david.cole committed CMakeLists.txt 1.125 1.126
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Oct 14 14:18:49 EDT 2009
Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv20822/Tests
Modified Files:
CMakeLists.txt
Log Message:
Use macro instead of function since DASH2 continuous dashboard still uses CMake 2.4.8 to drive the dashboard. Add clarifying comments so that a future developer does not delete seemingly unused variables: they are used: inside the input to the configure_file call.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.125
retrieving revision 1.126
diff -C 2 -d -r1.125 -r1.126
*** CMakeLists.txt 14 Oct 2009 17:32:46 -0000 1.125
--- CMakeLists.txt 14 Oct 2009 18:18:47 -0000 1.126
***************
*** 1114,1122 ****
! function(add_failed_submit_test name source build in out log regex)
configure_file("${in}" "${out}" @ONLY)
add_test(${name} ${CMAKE_CTEST_COMMAND} -S "${out}" -V --output-log "${log}")
set_tests_properties(${name} PROPERTIES PASS_REGULAR_EXPRESSION "${regex}")
! endfunction()
set(regex "(Problems when submitting via S*CP")
--- 1114,1131 ----
! # Use macro, not function so that build can still be driven by CMake 2.4.
! # After 2.6 is required, this could be a function without the extra 'set'
! # calls.
! #
! macro(add_failed_submit_test name source build in out log regex)
! # Have variables named source, build and drop_method because the
! # configure_file call expects those variables to be defined.
! #
! set(source "${source}")
! set(build "${build}")
configure_file("${in}" "${out}" @ONLY)
add_test(${name} ${CMAKE_CTEST_COMMAND} -S "${out}" -V --output-log "${log}")
set_tests_properties(${name} PROPERTIES PASS_REGULAR_EXPRESSION "${regex}")
! endmacro()
set(regex "(Problems when submitting via S*CP")
More information about the Cmake-commits
mailing list