[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.56 1.57

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv14428/Tests

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Remove condition on use of CMake 2.4 commands

  - Commands SET_TESTS_PROPERTIES and GET_TEST_PROPERTY exist
    in CMake 2.4, which is now required.
  - Therefore we need not check before using them.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.56
retrieving revision 1.57
diff -C 2 -d -r1.56 -r1.57
*** CMakeLists.txt	3 Jul 2008 18:34:28 -0000	1.56
--- CMakeLists.txt	3 Jul 2008 18:38:57 -0000	1.57
***************
*** 140,146 ****
      ADD_TEST(NightlyCMakeBuild 
        /bin/sh ${CMake_BINARY_DIR}/Tests/CMake-CVS/nightly-cmake.sh)
!     IF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
!       SET_TESTS_PROPERTIES ( NightlyCMakeBuild PROPERTIES TIMEOUT 3500)
!     ENDIF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
    ENDIF(CMAKE_BUILD_NIGHTLY_WINDOWS_TEST)
  
--- 140,144 ----
      ADD_TEST(NightlyCMakeBuild 
        /bin/sh ${CMake_BINARY_DIR}/Tests/CMake-CVS/nightly-cmake.sh)
!     SET_TESTS_PROPERTIES ( NightlyCMakeBuild PROPERTIES TIMEOUT 3500)
    ENDIF(CMAKE_BUILD_NIGHTLY_WINDOWS_TEST)
  
***************
*** 582,593 ****
      --test-command Exec2
      )
!   IF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
!     SET_TESTS_PROPERTIES ( qtwrapping PROPERTIES DEPENDS wrapping)
!     SET_TESTS_PROPERTIES ( testdriver1 PROPERTIES DEPENDS qtwrapping)
!     SET_TESTS_PROPERTIES ( testdriver2 PROPERTIES DEPENDS testdriver1)
!     SET_TESTS_PROPERTIES ( testdriver3 PROPERTIES DEPENDS testdriver2)
!     SET_TESTS_PROPERTIES ( linkorder2 PROPERTIES DEPENDS linkorder1)
!     SET_TESTS_PROPERTIES ( SimpleInstall-Stage2 PROPERTIES DEPENDS SimpleInstall)
!   ENDIF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
  
    IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
--- 580,589 ----
      --test-command Exec2
      )
!   SET_TESTS_PROPERTIES ( qtwrapping PROPERTIES DEPENDS wrapping)
!   SET_TESTS_PROPERTIES ( testdriver1 PROPERTIES DEPENDS qtwrapping)
!   SET_TESTS_PROPERTIES ( testdriver2 PROPERTIES DEPENDS testdriver1)
!   SET_TESTS_PROPERTIES ( testdriver3 PROPERTIES DEPENDS testdriver2)
!   SET_TESTS_PROPERTIES ( linkorder2 PROPERTIES DEPENDS linkorder1)
!   SET_TESTS_PROPERTIES ( SimpleInstall-Stage2 PROPERTIES DEPENDS SimpleInstall)
  
    IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
***************
*** 735,758 ****
        )
      # these tests take a long time, make sure they have it
!     IF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
!       # if timeouts have not already been set
!       GET_TEST_PROPERTY(CTestTest TIMEOUT PREVIOUS_TIMEOUT)
!       IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
!         SET_TESTS_PROPERTIES ( CTestTest
!           PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
!       ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
  
!       GET_TEST_PROPERTY(CTestTest2 TIMEOUT PREVIOUS_TIMEOUT)
!       IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
!         SET_TESTS_PROPERTIES ( CTestTest2
!           PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
!       ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
  
!       GET_TEST_PROPERTY(CTestTest3 TIMEOUT PREVIOUS_TIMEOUT)
!       IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
!         SET_TESTS_PROPERTIES ( CTestTest3
!           PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
!       ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
!     ENDIF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
    ENDIF (CTEST_TEST_CTEST AND CMAKE_RUN_LONG_TESTS)
    
--- 731,752 ----
        )
      # these tests take a long time, make sure they have it
!     # if timeouts have not already been set
!     GET_TEST_PROPERTY(CTestTest TIMEOUT PREVIOUS_TIMEOUT)
!     IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
!       SET_TESTS_PROPERTIES ( CTestTest
!         PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
!     ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
  
!     GET_TEST_PROPERTY(CTestTest2 TIMEOUT PREVIOUS_TIMEOUT)
!     IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
!       SET_TESTS_PROPERTIES ( CTestTest2
!         PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
!     ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
  
!     GET_TEST_PROPERTY(CTestTest3 TIMEOUT PREVIOUS_TIMEOUT)
!     IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
!       SET_TESTS_PROPERTIES ( CTestTest3
!         PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
!     ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
    ENDIF (CTEST_TEST_CTEST AND CMAKE_RUN_LONG_TESTS)
    
***************
*** 779,790 ****
  
      # provide more time for the bootstrap test
!     IF (COMMAND GET_TEST_PROPERTY)
!       GET_TEST_PROPERTY(BootstrapTest TIMEOUT PREVIOUS_TIMEOUT)
!       IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
!         SET_TESTS_PROPERTIES ( BootstrapTest
!           PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
!       ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
!     ENDIF (COMMAND GET_TEST_PROPERTY)
!       
    ENDIF(UNIX AND CMAKE_RUN_LONG_TESTS AND NOT CMAKE_SKIP_BOOTSTRAP_TEST)
  
--- 773,781 ----
  
      # provide more time for the bootstrap test
!     GET_TEST_PROPERTY(BootstrapTest TIMEOUT PREVIOUS_TIMEOUT)
!     IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
!       SET_TESTS_PROPERTIES ( BootstrapTest
!         PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
!     ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
    ENDIF(UNIX AND CMAKE_RUN_LONG_TESTS AND NOT CMAKE_SKIP_BOOTSTRAP_TEST)