kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Extend previous patch from Mathieu Malaterre to apply override to the build tool also.

Browse Source
This commit is contained in:
Brad King 2008-05-21 14:02:40 -04:00
parent db52ce45fa
commit 40d06f542c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/CMakeImportBuildSettings.cmake
View File

@ -95,7 +95,7 @@ MACRO(CMAKE_IMPORT_BUILD_SETTINGS SETTINGS_FILE)
# Build tool must match on Windows. # Build tool must match on Windows.
IF(WIN32) IF(WIN32)
IF(CMAKE_BUILD_TOOL_MISMATCH) IF(CMAKE_BUILD_TOOL_MISMATCH AND NOT CMAKE_OVERRIDE_COMPILER_MISMATCH)
MESSAGE(SEND_ERROR MESSAGE(SEND_ERROR
"This project, ${PROJECT_NAME}, depends on the project " "This project, ${PROJECT_NAME}, depends on the project "
"${CMAKE_BUILD_SETTING_PROJECT_NAME}. Unfortunately " "${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} or rebuild "
"${CMAKE_BUILD_SETTING_PROJECT_NAME} with the correct " "${CMAKE_BUILD_SETTING_PROJECT_NAME} with the correct "
"generator. ") "generator. ")
ENDIF(CMAKE_BUILD_TOOL_MISMATCH) ENDIF(CMAKE_BUILD_TOOL_MISMATCH AND NOT CMAKE_OVERRIDE_COMPILER_MISMATCH)
ENDIF(WIN32) ENDIF(WIN32)
# Enforce the C++ compiler setting. # Enforce the C++ compiler setting.