[cmake-commits] hoffman committed IncludeTest.cmake.in 1.3 1.4
ToolchainTest.cmake.in 1.4 1.5
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Jun 6 13:43:48 EDT 2007
Update of /cvsroot/CMake/CMake/Tests/CMakeTests
In directory public:/mounts/ram/cvs-serv18994
Modified Files:
IncludeTest.cmake.in ToolchainTest.cmake.in
Log Message:
ENH: fix it
Index: ToolchainTest.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeTests/ToolchainTest.cmake.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ToolchainTest.cmake.in 6 Jun 2007 17:32:01 -0000 1.4
+++ ToolchainTest.cmake.in 6 Jun 2007 17:43:46 -0000 1.5
@@ -80,11 +80,11 @@
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
Index: IncludeTest.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeTests/IncludeTest.cmake.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- IncludeTest.cmake.in 6 Jun 2007 17:32:01 -0000 1.3
+++ IncludeTest.cmake.in 6 Jun 2007 17:43:46 -0000 1.4
@@ -8,11 +8,11 @@
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(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}")
More information about the Cmake-commits
mailing list