[cmake-commits] alex committed CMakeLists.txt 1.14 1.15

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:

COMP: fix tests where the building cmake doesn't have GET_TEST_PROPERTY

Alex


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- CMakeLists.txt	26 Jun 2007 19:30:01 -0000	1.14
+++ CMakeLists.txt	27 Jun 2007 12:43:06 -0000	1.15
@@ -621,7 +621,7 @@
       --output-log "${CMake_BINARY_DIR}/Tests/CTestTest3/testOutput.log"
       )
     # these tests take a long time, make sure they have it
-    IF(COMMAND SET_TESTS_PROPERTIES)
+    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)
@@ -637,7 +637,7 @@
       IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
         SET_TESTS_PROPERTIES ( CTestTest3 PROPERTIES TIMEOUT 1500)
       ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
-    ENDIF(COMMAND SET_TESTS_PROPERTIES)
+    ENDIF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
   ENDIF (CTEST_TEST_CTEST AND CMAKE_RUN_LONG_TESTS)
   
   IF("${CMAKE_TEST_GENERATOR}" MATCHES Xcode)