From 72dd738bd4856dcd2a483e732a26f49e9c6dfcc4 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 14 Nov 2013 14:43:02 -0500 Subject: [PATCH] Tests: Fix MFC test heuristic for empty CMAKE_TEST_MAKEPROGRAM Also disable the MFC test if CMAKE_MAKE_PROGRAM is vcexpress. --- Tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 6c3e47873..4e016e1b3 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")