diff options
| author | Brad King <brad.king@kitware.com> | 2016-02-24 14:39:10 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-02-24 14:39:10 (GMT) |
| commit | 6f00fc58ed7f7cb3775bf77192ecde154884aa30 (patch) | |
| tree | e4e0da9c76273ebc06a69f0fe69b80a3260706ea /Tests | |
| parent | be98577f13299456804f619f46dc5a0560bcb176 (diff) | |
| parent | c05678ad2873bc0ee9070c9eab181242c3e115a0 (diff) | |
| download | CMake-6f00fc58ed7f7cb3775bf77192ecde154884aa30.zip CMake-6f00fc58ed7f7cb3775bf77192ecde154884aa30.tar.gz CMake-6f00fc58ed7f7cb3775bf77192ecde154884aa30.tar.bz2 | |
Merge topic 'test-FindPackageModeMakefileTest-optionally'
c05678ad Tests: Add option to disable FindPackageModeMakefileTest
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/FindPackageModeMakefileTest/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tests/FindPackageModeMakefileTest/CMakeLists.txt b/Tests/FindPackageModeMakefileTest/CMakeLists.txt index 8e21c32..56fcc5d 100644 --- a/Tests/FindPackageModeMakefileTest/CMakeLists.txt +++ b/Tests/FindPackageModeMakefileTest/CMakeLists.txt @@ -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 |