diff options
| -rw-r--r-- | Modules/CMakeImportBuildSettings.cmake | 20 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 1 |
2 files changed, 18 insertions, 3 deletions
diff --git a/Modules/CMakeImportBuildSettings.cmake b/Modules/CMakeImportBuildSettings.cmake index e2b3b49..9af301b 100644 --- a/Modules/CMakeImportBuildSettings.cmake +++ b/Modules/CMakeImportBuildSettings.cmake @@ -88,10 +88,24 @@ MACRO(CMAKE_IMPORT_BUILD_SETTINGS SETTINGS_FILE) IF(WIN32) IF(CMAKE_BUILD_TOOL_MISMATCH) MESSAGE(SEND_ERROR + "This project, ${PROJECT_NAME}, depends on the project " + "${CMAKE_BUILD_SETTING_PROJECT_NAME}. Unfortunately " "${CMAKE_BUILD_SETTING_PROJECT_NAME} was built using " - "\"${CMAKE_BUILD_TOOL2}\", but ${PROJECT_NAME} " - "is using \"${CMAKE_BUILD_TOOL1}\". The build will fail. " - "Try selecting a different CMake Generator.") + "\"${CMAKE_BUILD_TOOL2}\", but you are trying to build " + "${PROJECT_NAME} using \"${CMAKE_BUILD_TOOL1}\"." + "In order for this build to succeed, both projects must be " + "built with the same Generator. To change the Generator you " + "are using for the project ${PROJECT_NAME}, you must " + "delete the cache, and then rerun cmake and this " + "time select the same Generator that was used to build " + "${CMAKE_BUILD_SETTING_PROJECT_NAME}. If " + "${CMAKE_BUILD_SETTING_PROJECT_NAME} was built using a " + "generator that you do not have (for example it was built " + "with Visual Studio 6 and you only have 7) then you will " + "need to select a different version of " + "${CMAKE_BUILD_SETTING_PROJECT_NAME} or rebuild " + "${CMAKE_BUILD_SETTING_PROJECT_NAME} with the correct " + "generator. ") ENDIF(CMAKE_BUILD_TOOL_MISMATCH) ENDIF(WIN32) diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 67a4256..605ed10 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -175,6 +175,7 @@ static const char* cmCTestWarningMatches[] = { "([^ :]+) : warning", "([^:]+): warning", "\", line [0-9]+\\.[0-9]+: [0-9]+-[0-9]+ \\(W\\)", + "^cxx: Warning:", 0 }; |