Merge topic 'test-FindPackageModeMakefileTest-optionally'

c05678ad Tests: Add option to disable FindPackageModeMakefileTest

Merge topic 'test-FindPackageModeMakefileTest-optionally'
6f00fc58 · Brad King · Kitware Robot · be98577f · c05678ad · 6f00fc58
Commit 6f00fc58 authored 9 years ago by Brad King Committed by Kitware Robot 9 years ago
--- a/Tests/FindPackageModeMakefileTest/CMakeLists.txt
+++ b/Tests/FindPackageModeMakefileTest/CMakeLists.txt


-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