Bill Hoffman 18 lat temu
rodzic
commit
c8067b3904

+ 5 - 4
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}")
 

+ 2 - 2
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