diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-14 19:43:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-11-18 16:30:50 (GMT) |
| commit | 72dd738bd4856dcd2a483e732a26f49e9c6dfcc4 (patch) | |
| tree | d72234f80804aad579b873da7fd9494e34a785f3 /Tests | |
| parent | fd6076d075d705c4731f71a544436ba82a1577bf (diff) | |
| download | CMake-72dd738bd4856dcd2a483e732a26f49e9c6dfcc4.zip CMake-72dd738bd4856dcd2a483e732a26f49e9c6dfcc4.tar.gz CMake-72dd738bd4856dcd2a483e732a26f49e9c6dfcc4.tar.bz2 | |
Tests: Fix MFC test heuristic for empty CMAKE_TEST_MAKEPROGRAM
Also disable the MFC test if CMAKE_MAKE_PROGRAM is vcexpress.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 6c3e478..4e016e1 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1492,7 +1492,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ # Look for evidence that this is a VCExpress build. If so, avoid # the MFC test by default. - string(TOLOWER "${CMAKE_TEST_MAKEPROGRAM}" mkprog) + string(TOLOWER "${CMAKE_MAKE_PROGRAM};${CMAKE_TEST_MAKEPROGRAM}" mkprog) if(mkprog MATCHES "vcexpress") message(STATUS "CMAKE_TEST_MAKEPROGRAM indicates vcexpress, avoiding MFC test") |