From 6b2bf5756bd01a955606f1963ad44bfde21f173f Mon Sep 17 00:00:00 2001
From: Rich Chiodo <rchiodo@microsoft.com>
Date: Thu, 15 Dec 2016 12:22:14 -0800
Subject: FindMFC: Check for static MFC variant

Some CMake applications can set /MT without setting CMAKE_MFC_FLAG.
This change lets FindMFC work in those situations.
---
 Modules/FindMFC.cmake       | 11 +++++++++++
 Tests/MFC/CMakeLists.txt.in |  5 +++++
 2 files changed, 16 insertions(+)

diff --git a/Modules/FindMFC.cmake b/Modules/FindMFC.cmake
index 5c2dbbf..3baaf32 100644
--- a/Modules/FindMFC.cmake
+++ b/Modules/FindMFC.cmake
@@ -31,6 +31,7 @@ if(MFC_ATTEMPT_TRY_COMPILE)
     configure_file(${CMAKE_ROOT}/Modules/CheckIncludeFile.cxx.in
       ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx)
     message(STATUS "Looking for MFC")
+    # Try both shared and static as the root project may have set the /MT flag
     try_compile(MFC_HAVE_MFC
       ${CMAKE_BINARY_DIR}
       ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx
@@ -38,6 +39,16 @@ if(MFC_ATTEMPT_TRY_COMPILE)
       -DCMAKE_MFC_FLAG:STRING=2
       -DCOMPILE_DEFINITIONS:STRING=-D_AFXDLL
       OUTPUT_VARIABLE OUTPUT)
+    if(NOT MFC_HAVE_MFC)
+      configure_file(${CMAKE_ROOT}/Modules/CheckIncludeFile.cxx.in
+        ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx)
+      try_compile(MFC_HAVE_MFC
+        ${CMAKE_BINARY_DIR}
+        ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx
+        CMAKE_FLAGS
+        -DCMAKE_MFC_FLAG:STRING=1
+        OUTPUT_VARIABLE OUTPUT)
+    endif()
     if(MFC_HAVE_MFC)
       message(STATUS "Looking for MFC - found")
       set(MFC_HAVE_MFC 1 CACHE INTERNAL "Have MFC?")
diff --git a/Tests/MFC/CMakeLists.txt.in b/Tests/MFC/CMakeLists.txt.in
index e6bfabd..bf98e91 100644
--- a/Tests/MFC/CMakeLists.txt.in
+++ b/Tests/MFC/CMakeLists.txt.in
@@ -45,6 +45,11 @@ set(files
 
 set(CMAKE_MFC_FLAG "@CMAKE_MFC_FLAG_VALUE@")
 
+FIND_PACKAGE(MFC)
+IF (NOT MFC_FOUND)
+  MESSAGE(FATAL_ERROR "MFC Could not be found during the MFC test")
+ENDIF()
+
 if("${CMAKE_MFC_FLAG}" STREQUAL "1")
   msvc_link_to_static_crt()
 else()
-- 
cgit v0.12