[cmake-commits] alex committed FindBaseTest.cmake.in 1.1.2.1 1.1.2.2
ToolchainTest.cmake.in 1.1.2.1 1.1.2.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu May 17 11:09:56 EDT 2007
Update of /cvsroot/CMake/CMake/Tests/CMakeTests
In directory public:/mounts/ram/cvs-serv15504
Modified Files:
Tag: CMake-CrossCompileBasic
FindBaseTest.cmake.in ToolchainTest.cmake.in
Log Message:
BUG: correct quoting in the tests so that the new tests pass
Alex
Index: FindBaseTest.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeTests/Attic/FindBaseTest.cmake.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- FindBaseTest.cmake.in 17 May 2007 14:24:37 -0000 1.1.2.1
+++ FindBaseTest.cmake.in 17 May 2007 15:09:54 -0000 1.1.2.2
@@ -1,4 +1,4 @@
-set(MY_SOURCE_DIR @CMAKE_CURRENT_SOURCE_DIR@)
+set(MY_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@")
set(_HEADER cmake_i_do_not_exist_in_the_system.h)
set(_HEADER_FULL "${MY_SOURCE_DIR}/include/${_HEADER}")
@@ -10,7 +10,7 @@
endif(FOO_H_1)
# with this it still should not be found, since the include/ subdir is still missing
-set(CMAKE_INCLUDE_PATH ${MY_SOURCE_DIR})
+set(CMAKE_INCLUDE_PATH "${MY_SOURCE_DIR}")
find_file(FOO_H_2 ${_HEADER})
if(FOO_H_2)
message(FATAL_ERROR "${_HEADER} found: ${FOO_H_2}, it should not exist !")
@@ -31,7 +31,7 @@
# when setting CMAKE_FIND_ROOT_PATH to the current source dir,
# together with the CMAKE_INCLUDE_PATH it should be found
-set(CMAKE_FIND_ROOT_PATH blub ${MY_SOURCE_DIR})
+set(CMAKE_FIND_ROOT_PATH blub "${MY_SOURCE_DIR}")
find_file(FOO_H_5 ${_HEADER})
if(NOT "${FOO_H_5}" STREQUAL "${_HEADER_FULL}")
message(FATAL_ERROR "Did not find \"${_HEADER_FULL}\"\ngot ${FOO_H_5} instead !")
Index: ToolchainTest.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeTests/Attic/ToolchainTest.cmake.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- ToolchainTest.cmake.in 17 May 2007 14:24:37 -0000 1.1.2.1
+++ ToolchainTest.cmake.in 17 May 2007 15:09:54 -0000 1.1.2.2
@@ -7,20 +7,20 @@
endmacro(MARK_AS_ADVANCED)
# set this to a place where we are allowed to write
-set(CMAKE_PLATFORM_ROOT_BIN ${CMAKE_CURRENT_BINARY_DIR})
+set(CMAKE_PLATFORM_ROOT_BIN "${CMAKE_CURRENT_BINARY_DIR}")
# don't run the compiler detection
set(CMAKE_C_COMPILER_ID_RUN 1)
set(CMAKE_CXX_COMPILER_ID_RUN 1)
-set(MY_SOURCE_DIR @CMAKE_CURRENT_SOURCE_DIR@)
+set(MY_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@")
############################################################
# now define a toolchain file and check that everything is
# detected correctly and nothing predefined is overwritten
-set(CMAKE_TOOLCHAIN_FILE ${MY_SOURCE_DIR}/DummyToolchain.cmake)
+set(CMAKE_TOOLCHAIN_FILE "${MY_SOURCE_DIR}/DummyToolchain.cmake")
include(CMakeDetermineSystem)
include(CMakeDetermineCCompiler)
More information about the Cmake-commits
mailing list