Merge topic 'test-FindPackageModeMakefileTest-optionally'

c05678ad Tests: Add option to disable FindPackageModeMakefileTest
This commit is contained in:
Brad King 2016-02-24 09:39:10 -05:00 committed by CMake Topic Stage
commit 6f00fc58ed
1 changed files with 2 additions and 1 deletions

View File

@ -1,6 +1,7 @@
if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Makefile")
if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Makefile" AND
NOT CMake_TEST_NO_FindPackageModeMakefileTest)
# Test whether the make is GNU make, and only add the test in this case,
# since the configured makefile in this test uses $(shell ...), which