Browse Source

ENH: use lower case for file compare on windows

Bill Hoffman 19 years ago
parent
commit
b4f4a06102
2 changed files with 30 additions and 11 deletions
  1. 20 6
      Tests/CMakeTests/IncludeTest.cmake.in
  2. 10 5
      Tests/CMakeTests/ToolchainTest.cmake.in

+ 20 - 6
Tests/CMakeTests/IncludeTest.cmake.in

@@ -3,9 +3,17 @@ include(I_am_not_here OPTIONAL)
 
 # this one must be found and the result must be put into _includedFile
 include(CMake RESULT_VARIABLE _includedFile)
-if(NOT "${_includedFile}"   STREQUAL "${CMAKE_ROOT}/Modules/CMake.cmake")
-   message(FATAL_ERROR "Wrong CMake.cmake was included: \"${_includedFile}\"")
-endif(NOT "${_includedFile}"   STREQUAL "${CMAKE_ROOT}/Modules/CMake.cmake")
+
+set(fileOne "${_includedFile}")
+set(fileTwo "${CMAKE_ROOT}/Modules/CMake.cmake")
+if(WIN32)
+  string(TOLOWER "${fileOne}" fileOne)
+  string(TOLOWER "${fileTwo}" fileOne)
+endif(WIN32)
+
+if(NOT "${fileOne}"   STREQUAL "${fileTwo}")
+   message(FATAL_ERROR "Wrong CMake.cmake was included: \"${$fileOne}\" expected \"${$fileTwo}\"")
+endif(NOT "${fileOne}"   STREQUAL "${fileTwo}")
 
 # this one must return NOTFOUND in _includedFile
 include(I_do_not_exist OPTIONAL RESULT_VARIABLE _includedFile)
@@ -16,7 +24,13 @@ endif(_includedFile)
 
 # and this one must succeed too
 include(CMake OPTIONAL RESULT_VARIABLE _includedFile)
+set(fileOne "${_includedFile}")
+set(fileTwo "${CMAKE_ROOT}/Modules/CMake.cmake")
+if(WIN32)
+  string(TOLOWER "${fileOne}" fileOne)
+  string(TOLOWER "${fileTwo}" fileOne)
+endif(WIN32)
+if(NOT "${fileOne}"   STREQUAL "${fileTwo}")
+   message(FATAL_ERROR "Wrong CMake.cmake was included: \"${$fileOne}\" expected \"${$fileTwo}\"")
+endif(NOT "${fileOne}"   STREQUAL "${fileTwo}")
 
-if(NOT "${_includedFile}"   STREQUAL "${CMAKE_ROOT}/Modules/CMake.cmake")
-   message(FATAL_ERROR "Wrong CMake.cmake was included: \"${_includedFile}\"")
-endif(NOT "${_includedFile}"   STREQUAL "${CMAKE_ROOT}/Modules/CMake.cmake")

+ 10 - 5
Tests/CMakeTests/ToolchainTest.cmake.in

@@ -76,11 +76,16 @@ endif(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Dumdidum")
 if(NOT "${CMAKE_SYSTEM}" STREQUAL "Dumdidum-1.0")
    message(FATAL_ERROR "CMAKE_SYSTEM wrong: \"${CMAKE_SYSTEM}\", expected: \"Dumdidum-1.0\"")
 endif(NOT "${CMAKE_SYSTEM}" STREQUAL "Dumdidum-1.0")
-
-if(NOT "${_INCLUDED_TOOLCHAIN_FILE}" STREQUAL "${MY_SOURCE_DIR}/DummyToolchain.cmake")
-   message(FATAL_ERROR "wrong toolchain file loaded: \"${_INCLUDED_TOOLCHAIN_FILE}\", expected: \"${MY_SOURCE_DIR}/DummyToolchain.cmake\"")
-endif(NOT "${_INCLUDED_TOOLCHAIN_FILE}" STREQUAL "${MY_SOURCE_DIR}/DummyToolchain.cmake")
-
+set(fileOne "${_INCLUDED_TOOLCHAIN_FILE}")
+set(fileTwo "${MY_SOURCE_DIR}/DummyToolchain.cmake")
+if(WIN32)
+  string(TOLOWER "${fileOne}" fileOne)
+  string(TOLOWER "${fileTwo}" fileOne)
+endif(WIN32)
+
+if(NOT "${fileOne}"   STREQUAL "${fileTwo}")
+   message(FATAL_ERROR "Wrong toolchain was loaded: \"${$fileOne}\" expected \"${$fileTwo}\"")
+endif(NOT "${fileOne}"   STREQUAL "${fileTwo}")
 
 # check that CMAKE_HOST_SYSTEM_XXX and _SYSTEM_xxx detected above are identical
 if(NOT "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "${NATIVE_SYSTEM_NAME}")