ENH: make sure EXECUTE_PROCESS is there because in bootstrap it is not
This commit is contained in:
parent
2d6e914b2d
commit
13bd83c953
@ -1012,7 +1012,7 @@ IF(BUILD_TESTING)
|
|||||||
)
|
)
|
||||||
ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
|
ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
|
||||||
SET(MAKE_IS_GNU )
|
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
|
EXECUTE_PROCESS(COMMAND ${CMAKE_TEST_MAKEPROGRAM} --version
|
||||||
RESULT_VARIABLE res OUTPUT_VARIABLE out
|
RESULT_VARIABLE res OUTPUT_VARIABLE out
|
||||||
ERROR_QUIET
|
ERROR_QUIET
|
||||||
@ -1022,7 +1022,7 @@ IF(BUILD_TESTING)
|
|||||||
SET(MAKE_IS_GNU 1)
|
SET(MAKE_IS_GNU 1)
|
||||||
ENDIF("${out}" MATCHES "GNU")
|
ENDIF("${out}" MATCHES "GNU")
|
||||||
ENDIF("${res}" EQUAL 0)
|
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
|
# only add this test on platforms that support it
|
||||||
# some old versions of make simply cannot handle spaces in paths
|
# some old versions of make simply cannot handle spaces in paths
|
||||||
|
Loading…
x
Reference in New Issue
Block a user