[cmake-commits] martink committed CMakeLists.txt 1.334 1.335
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Feb 20 15:03:24 EST 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv1040
Modified Files:
CMakeLists.txt
Log Message:
ENH: only add the test for some platforms
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -d -r1.334 -r1.335
--- CMakeLists.txt 20 Feb 2007 14:35:21 -0000 1.334
+++ CMakeLists.txt 20 Feb 2007 20:03:22 -0000 1.335
@@ -1013,18 +1013,23 @@
ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
- ADD_TEST(SubDirSpaces ${CMAKE_CTEST_COMMAND}
- --build-and-test
- "${CMake_SOURCE_DIR}/Tests/SubDirSpaces"
- "${CMake_BINARY_DIR}/Tests/SubDirSpaces"
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/SubDirSpaces/Executable Sources"
- --build-generator ${CMAKE_TEST_GENERATOR}
- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
- --build-project SUBDIR
- --test-command test
- "${CMake_BINARY_DIR}/Tests/SubDirSpaces/ShouldBeHere"
- "${CMake_BINARY_DIR}/Tests/SubDirSpaces/testfromsubdir.obj"
- )
+ # only add this test on platforms that support it
+ # some old versions of make simply cannot handle spaces in paths
+ IF (${CMAKE_TEST_MAKEPROGRAM} MATCHES "nmake|gmake|wmake")
+ ADD_TEST(SubDirSpaces ${CMAKE_CTEST_COMMAND}
+ --build-and-test
+ "${CMake_SOURCE_DIR}/Tests/SubDirSpaces"
+ "${CMake_BINARY_DIR}/Tests/SubDirSpaces"
+ --build-exe-dir
+ "${CMake_BINARY_DIR}/Tests/SubDirSpaces/Executable Sources"
+ --build-generator ${CMAKE_TEST_GENERATOR}
+ --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+ --build-project SUBDIR
+ --test-command test
+ "${CMake_BINARY_DIR}/Tests/SubDirSpaces/ShouldBeHere"
+ "${CMake_BINARY_DIR}/Tests/SubDirSpaces/testfromsubdir.obj"
+ )
+ ENDIF (${CMAKE_TEST_MAKEPROGRAM} MATCHES "nmake|gmake|wmake")
IF (WIN32)
ADD_TEST(SubDir ${CMAKE_CTEST_COMMAND}
More information about the Cmake-commits
mailing list