diff options
| author | Brad King <brad.king@kitware.com> | 2008-05-21 18:02:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-05-21 18:02:40 (GMT) |
| commit | 40d06f542c9813f8cf96a91ba3b90ce0d0945bcb (patch) | |
| tree | bb4f22b5de0104b95c199ba34ff3aafed718ea6b | |
| parent | db52ce45fa3b82435535428687fd32f20ce6bd7e (diff) | |
| download | CMake-40d06f542c9813f8cf96a91ba3b90ce0d0945bcb.zip CMake-40d06f542c9813f8cf96a91ba3b90ce0d0945bcb.tar.gz CMake-40d06f542c9813f8cf96a91ba3b90ce0d0945bcb.tar.bz2 | |
ENH: Extend previous patch from Mathieu Malaterre to apply override to the build tool also.
| -rw-r--r-- | Modules/CMakeImportBuildSettings.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeImportBuildSettings.cmake b/Modules/CMakeImportBuildSettings.cmake index cad7898..529b2ed 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. |