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

better error message

Browse Source
This commit is contained in:
Ken Martin 2004-05-25 11:20:38 -04:00
parent f49e76899c
commit e67ffe8527
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Modules/CMakeImportBuildSettings.cmake
View File

@ -88,10 +88,24 @@ MACRO(CMAKE_IMPORT_BUILD_SETTINGS SETTINGS_FILE)
IF(WIN32) IF(WIN32)
IF(CMAKE_BUILD_TOOL_MISMATCH) IF(CMAKE_BUILD_TOOL_MISMATCH)
MESSAGE(SEND_ERROR 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_SETTING_PROJECT_NAME} was built using "
"\"${CMAKE_BUILD_TOOL2}\", but ${PROJECT_NAME} " "\"${CMAKE_BUILD_TOOL2}\", but you are trying to build "
"is using \"${CMAKE_BUILD_TOOL1}\". The build will fail. " "${PROJECT_NAME} using \"${CMAKE_BUILD_TOOL1}\"."
"Try selecting a different CMake Generator.") "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(CMAKE_BUILD_TOOL_MISMATCH)
ENDIF(WIN32) ENDIF(WIN32)

1
Source/cmCTest.cxx
View File

@ -175,6 +175,7 @@ static const char* cmCTestWarningMatches[] = {
"([^ :]+) : warning", "([^ :]+) : warning",
"([^:]+): warning", "([^:]+): warning",
"\", line [0-9]+\\.[0-9]+: [0-9]+-[0-9]+ \\(W\\)", "\", line [0-9]+\\.[0-9]+: [0-9]+-[0-9]+ \\(W\\)",
"^cxx: Warning:",
0 0
}; };