[cmake-commits] hoffman committed CMakeLists.txt 1.338 1.339

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Feb 22 10:05:52 EST 2007


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

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: make sure EXECUTE_PROCESS is there because in bootstrap it is not


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -d -r1.338 -r1.339
--- CMakeLists.txt	22 Feb 2007 02:24:17 -0000	1.338
+++ CMakeLists.txt	22 Feb 2007 15:05:50 -0000	1.339
@@ -1012,7 +1012,7 @@
       )
   ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
   SET(MAKE_IS_GNU )
-  IF(${CMAKE_TEST_MAKEPROGRAM} MATCHES make)
+  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
@@ -1022,7 +1022,7 @@
         SET(MAKE_IS_GNU 1)
       ENDIF("${out}" MATCHES "GNU")
     ENDIF("${res}" EQUAL 0)
-  ENDIF(${CMAKE_TEST_MAKEPROGRAM} MATCHES make)
+  ENDIF(COMMAND EXECUTE_PROCESS AND ${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



More information about the Cmake-commits mailing list