From 40d06f542c9813f8cf96a91ba3b90ce0d0945bcb Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 21 May 2008 14:02:40 -0400
Subject: [PATCH] ENH: Extend previous patch from Mathieu Malaterre to apply
 override to the build tool also.

---
 Modules/CMakeImportBuildSettings.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Modules/CMakeImportBuildSettings.cmake b/Modules/CMakeImportBuildSettings.cmake
index cad78980b..529b2ed2a 100644
--- a/Modules/CMakeImportBuildSettings.cmake
+++ b/Modules/CMakeImportBuildSettings.cmake
@@ -95,7 +95,7 @@ MACRO(CMAKE_IMPORT_BUILD_SETTINGS SETTINGS_FILE)
 
     # Build tool must match on Windows.
     IF(WIN32)
-      IF(CMAKE_BUILD_TOOL_MISMATCH)
+      IF(CMAKE_BUILD_TOOL_MISMATCH AND NOT CMAKE_OVERRIDE_COMPILER_MISMATCH)
         MESSAGE(SEND_ERROR
                 "This project, ${PROJECT_NAME}, depends on the project "
                 "${CMAKE_BUILD_SETTING_PROJECT_NAME}. Unfortunately "
@@ -115,7 +115,7 @@ MACRO(CMAKE_IMPORT_BUILD_SETTINGS SETTINGS_FILE)
                 "${CMAKE_BUILD_SETTING_PROJECT_NAME} or rebuild "
                 "${CMAKE_BUILD_SETTING_PROJECT_NAME} with the correct "
                 "generator. ")
-      ENDIF(CMAKE_BUILD_TOOL_MISMATCH)
+      ENDIF(CMAKE_BUILD_TOOL_MISMATCH AND NOT CMAKE_OVERRIDE_COMPILER_MISMATCH)
     ENDIF(WIN32)
 
     # Enforce the C++ compiler setting.