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

ENH: fix for case difference with nmake

This commit is contained in:
Bill Hoffman 2006-07-24 16:58:05 -04:00
parent 284f6c6835
commit 2523629f4b
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Modules/CMakeImportBuildSettings.cmake
View File

@ -43,9 +43,16 @@ MACRO(CMAKE_IMPORT_BUILD_SETTINGS SETTINGS_FILE)
# Check the C++ compiler setting. If it is empty, the imported # Check the C++ compiler setting. If it is empty, the imported
# project is not a C++ project, and doesn't need a matching compiler. # project is not a C++ project, and doesn't need a matching compiler.
IF(CMAKE_BUILD_SETTING_CXX_COMPILER) IF(CMAKE_BUILD_SETTING_CXX_COMPILER)
STRING(COMPARE NOTEQUAL IF(WIN32)
"x${CMAKE_CXX_COMPILER}" "x${CMAKE_BUILD_SETTING_CXX_COMPILER}" STRING(TOLOWER "x${CMAKE_CXX_COMPILER}" COMPARE_CXX_LOCAL)
CMAKE_CXX_COMPILER_MISMATCH) STRING(TOLOWER "x${CMAKE_BUILD_SETTING_CXX_COMPILER}" COMPARE_CXX_REMOTE)
STRING(COMPARE NOTEQUAL "${COMPARE_CXX_LOCAL}" "${COMPARE_CXX_REMOTE}"
CMAKE_CXX_COMPILER_MISMATCH)
ELSE(WIN32)
STRING(COMPARE NOTEQUAL
"x${CMAKE_CXX_COMPILER}" "x${CMAKE_BUILD_SETTING_CXX_COMPILER}"
CMAKE_CXX_COMPILER_MISMATCH)
ENDIF(WIN32)
ENDIF(CMAKE_BUILD_SETTING_CXX_COMPILER) ENDIF(CMAKE_BUILD_SETTING_CXX_COMPILER)
# Check the C build variation flags. # Check the C build variation flags.
@ -119,7 +126,7 @@ MACRO(CMAKE_IMPORT_BUILD_SETTINGS SETTINGS_FILE)
"because C++ projects must use the same compiler. " "because C++ projects must use the same compiler. "
"If this message appears for more than one imported project, " "If this message appears for more than one imported project, "
"you have conflicting C++ compilers and will have to " "you have conflicting C++ compilers and will have to "
"re-build one of those projects.") "re-build one of those projects. Was set to ${CMAKE_CXX_COMPILER}")
SET(CMAKE_CXX_COMPILER ${CMAKE_BUILD_SETTING_CXX_COMPILER} SET(CMAKE_CXX_COMPILER ${CMAKE_BUILD_SETTING_CXX_COMPILER}
CACHE STRING "C++ compiler imported from ${CMAKE_BUILD_SETTING_PROJECT_NAME}." FORCE) CACHE STRING "C++ compiler imported from ${CMAKE_BUILD_SETTING_PROJECT_NAME}." FORCE)
ENDIF(CMAKE_CXX_COMPILER_MISMATCH) ENDIF(CMAKE_CXX_COMPILER_MISMATCH)