From c8067b39043b93b2d8e4e57c3f7ed5455c1fbb61 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 6 Jun 2007 13:43:46 -0400 Subject: ENH: fix it --- Tests/CMakeTests/IncludeTest.cmake.in | 9 +++++---- Tests/CMakeTests/ToolchainTest.cmake.in | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Tests/CMakeTests/IncludeTest.cmake.in b/Tests/CMakeTests/IncludeTest.cmake.in index 08294bb..01cec38 100644 --- a/Tests/CMakeTests/IncludeTest.cmake.in +++ b/Tests/CMakeTests/IncludeTest.cmake.in @@ -8,11 +8,11 @@ set(fileOne "${_includedFile}") set(fileTwo "${CMAKE_ROOT}/Modules/CMake.cmake") if(WIN32) string(TOLOWER "${fileOne}" fileOne) - string(TOLOWER "${fileTwo}" fileOne) + string(TOLOWER "${fileTwo}" fileTwo) endif(WIN32) if(NOT "${fileOne}" STREQUAL "${fileTwo}") - message(FATAL_ERROR "Wrong CMake.cmake was included: \"${$fileOne}\" expected \"${$fileTwo}\"") + message(FATAL_ERROR "Wrong CMake.cmake was included: \"${fileOne}\" expected \"${fileTwo}\"") endif(NOT "${fileOne}" STREQUAL "${fileTwo}") # this one must return NOTFOUND in _includedFile @@ -28,9 +28,10 @@ set(fileOne "${_includedFile}") set(fileTwo "${CMAKE_ROOT}/Modules/CMake.cmake") if(WIN32) string(TOLOWER "${fileOne}" fileOne) - string(TOLOWER "${fileTwo}" fileOne) + string(TOLOWER "${fileTwo}" fileTwo) endif(WIN32) + if(NOT "${fileOne}" STREQUAL "${fileTwo}") - message(FATAL_ERROR "Wrong CMake.cmake was included: \"${$fileOne}\" expected \"${$fileTwo}\"") + message(FATAL_ERROR "Wrong CMake.cmake was included: \"${fileOne}\" expected \"${fileTwo}\"") endif(NOT "${fileOne}" STREQUAL "${fileTwo}") diff --git a/Tests/CMakeTests/ToolchainTest.cmake.in b/Tests/CMakeTests/ToolchainTest.cmake.in index 361d698..bf0f1c2 100644 --- a/Tests/CMakeTests/ToolchainTest.cmake.in +++ b/Tests/CMakeTests/ToolchainTest.cmake.in @@ -80,11 +80,11 @@ set(fileOne "${_INCLUDED_TOOLCHAIN_FILE}") set(fileTwo "${MY_SOURCE_DIR}/DummyToolchain.cmake") if(WIN32) string(TOLOWER "${fileOne}" fileOne) - string(TOLOWER "${fileTwo}" fileOne) + string(TOLOWER "${fileTwo}" fileTwo) endif(WIN32) if(NOT "${fileOne}" STREQUAL "${fileTwo}") - message(FATAL_ERROR "Wrong toolchain was loaded: \"${$fileOne}\" expected \"${$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 -- cgit v0.12