summaryrefslogtreecommitdiffstats
path: root/Modules/CMakeImportBuildSettings.cmake
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2006-07-24 20:58:05 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2006-07-24 20:58:05 (GMT)
commit2523629f4b39f42fe0b99e326298e1297a40d19d (patch)
treed6747bbd28b3cf4ffd2a6a6614758ecbde794b6c /Modules/CMakeImportBuildSettings.cmake
parent284f6c683500512149c223c7387243c6d4968d7c (diff)
downloadCMake-2523629f4b39f42fe0b99e326298e1297a40d19d.zip
CMake-2523629f4b39f42fe0b99e326298e1297a40d19d.tar.gz
CMake-2523629f4b39f42fe0b99e326298e1297a40d19d.tar.bz2
ENH: fix for case difference with nmake
Diffstat (limited to 'Modules/CMakeImportBuildSettings.cmake')
-rw-r--r--Modules/CMakeImportBuildSettings.cmake15
1 files changed, 11 insertions, 4 deletions
diff --git a/Modules/CMakeImportBuildSettings.cmake b/Modules/CMakeImportBuildSettings.cmake
index 8d77aca..4a8c1e3 100644
--- a/Modules/CMakeImportBuildSettings.cmake
+++ b/Modules/CMakeImportBuildSettings.cmake
@@ -43,9 +43,16 @@ MACRO(CMAKE_IMPORT_BUILD_SETTINGS SETTINGS_FILE)
# Check the C++ compiler setting. If it is empty, the imported
# project is not a C++ project, and doesn't need a matching compiler.
IF(CMAKE_BUILD_SETTING_CXX_COMPILER)
- STRING(COMPARE NOTEQUAL
- "x${CMAKE_CXX_COMPILER}" "x${CMAKE_BUILD_SETTING_CXX_COMPILER}"
- CMAKE_CXX_COMPILER_MISMATCH)
+ IF(WIN32)
+ STRING(TOLOWER "x${CMAKE_CXX_COMPILER}" COMPARE_CXX_LOCAL)
+ 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)
# 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. "
"If this message appears for more than one imported project, "
"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}
CACHE STRING "C++ compiler imported from ${CMAKE_BUILD_SETTING_PROJECT_NAME}." FORCE)
ENDIF(CMAKE_CXX_COMPILER_MISMATCH)