Browse Source

Changed RunScript test to be in-source build safe

Zach Mullen 16 years ago
parent
commit
5eb4372001

+ 2 - 2
Tests/CMakeLists.txt

@@ -1218,11 +1218,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
     PASS_REGULAR_EXPRESSION "\\*\\*\\*Timeout")
     PASS_REGULAR_EXPRESSION "\\*\\*\\*Timeout")
   
   
   CONFIGURE_FILE(
   CONFIGURE_FILE(
-    "${CMake_SOURCE_DIR}/Tests/CTestTestRunScript/test.cmake"
+    "${CMake_SOURCE_DIR}/Tests/CTestTestRunScript/test.cmake.in"
     "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/test.cmake"
     "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/test.cmake"
     @ONLY ESCAPE_QUOTES)
     @ONLY ESCAPE_QUOTES)
   CONFIGURE_FILE(
   CONFIGURE_FILE(
-    "${CMake_SOURCE_DIR}/Tests/CTestTestRunScript/hello.cmake"
+    "${CMake_SOURCE_DIR}/Tests/CTestTestRunScript/hello.cmake.in"
     "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/hello.cmake"
     "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/hello.cmake"
     @ONLY ESCAPE_QUOTES)
     @ONLY ESCAPE_QUOTES)
   #ADD_TEST(CTestTestRunScript ${CMAKE_CTEST_COMMAND}
   #ADD_TEST(CTestTestRunScript ${CMAKE_CTEST_COMMAND}

+ 6 - 0
Tests/CTestTestRunScript/hello.cmake.in

@@ -0,0 +1,6 @@
+GET_FILENAME_COMPONENT(CTEST_COMMAND "${CMAKE_COMMAND}" PATH)
+SET(CTEST_COMMAND "${CTEST_COMMAND}/ctest")
+SET(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestRunScript")
+SET(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestRunScript")
+
+message("hello world")

+ 7 - 0
Tests/CTestTestRunScript/test.cmake.in

@@ -0,0 +1,7 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.1)
+GET_FILENAME_COMPONENT(CTEST_COMMAND "${CMAKE_COMMAND}" PATH)
+SET(CTEST_COMMAND "${CTEST_COMMAND}/ctest")
+SET(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestRunScript")
+SET(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestRunScript")
+
+CTEST_RUN_SCRIPT("${CTEST_BINARY_DIRECTORY}/hello.cmake")