[cmake-commits] king committed CMakeLists.txt 1.351 1.352

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv17599

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Enable SubDirSpaces test when building with bootstrapped cmake.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -d -r1.351 -r1.352
--- CMakeLists.txt	8 Mar 2007 18:05:02 -0000	1.351
+++ CMakeLists.txt	8 Mar 2007 18:13:58 -0000	1.352
@@ -996,17 +996,17 @@
       )
   ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
   SET(MAKE_IS_GNU )
-  IF(COMMAND EXECUTE_PROCESS AND ${CMAKE_TEST_MAKEPROGRAM} MATCHES make)
-    EXECUTE_PROCESS(COMMAND ${CMAKE_TEST_MAKEPROGRAM} --version
-      RESULT_VARIABLE res OUTPUT_VARIABLE out
-      ERROR_QUIET
+  IF(${CMAKE_TEST_MAKEPROGRAM} MATCHES make)
+    EXEC_PROGRAM(
+      ${CMAKE_TEST_MAKEPROGRAM} ARGS --version
+      RETURN_VALUE res OUTPUT_VARIABLE out
       )
     IF("${res}" EQUAL 0)
       IF("${out}" MATCHES "GNU")
         SET(MAKE_IS_GNU 1)
       ENDIF("${out}" MATCHES "GNU")
     ENDIF("${res}" EQUAL 0)
-  ENDIF(COMMAND EXECUTE_PROCESS AND ${CMAKE_TEST_MAKEPROGRAM} MATCHES make)
+  ENDIF(${CMAKE_TEST_MAKEPROGRAM} MATCHES make)
 
   # only add this test on platforms that support it
   # some old versions of make simply cannot handle spaces in paths