[cmake-commits] hoffman committed IncludeTest.cmake.in 1.2 1.3 ToolchainTest.cmake.in 1.3 1.4

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/CMakeTests
In directory public:/mounts/ram/cvs-serv15661

Modified Files:
	IncludeTest.cmake.in ToolchainTest.cmake.in 
Log Message:
ENH: use lower case for file compare on windows


Index: ToolchainTest.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeTests/ToolchainTest.cmake.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ToolchainTest.cmake.in	29 May 2007 15:36:07 -0000	1.3
+++ ToolchainTest.cmake.in	6 Jun 2007 17:32:01 -0000	1.4
@@ -76,11 +76,16 @@
 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")
+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 "${_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")
-
+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}")

Index: IncludeTest.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeTests/IncludeTest.cmake.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- IncludeTest.cmake.in	17 May 2007 17:20:44 -0000	1.2
+++ IncludeTest.cmake.in	6 Jun 2007 17:32:01 -0000	1.3
@@ -3,9 +3,17 @@
 
 # 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 @@
 
 # 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")