[Cmake-commits] [cmake-commits] king committed FindBaseTest.cmake.in 1.3 1.4

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Jun 9 15:09:16 EDT 2008


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

Modified Files:
	FindBaseTest.cmake.in 
Log Message:
ENH: Add test for new find_* command HINTS option.


Index: FindBaseTest.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeTests/FindBaseTest.cmake.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** FindBaseTest.cmake.in	8 Jun 2008 15:41:16 -0000	1.3
--- FindBaseTest.cmake.in	9 Jun 2008 19:09:14 -0000	1.4
***************
*** 7,10 ****
--- 7,11 ----
  set(_HEADER cmake_i_do_not_exist_in_the_system.h)
  set(_HEADER_FULL "${MY_SOURCE_DIR}/include/${_HEADER}")
+ set(_HEADER_FULL_A "${MY_SOURCE_DIR}/A/include/${_HEADER}")
  
  # at first check that the header isn't found without special measures
***************
*** 14,17 ****
--- 15,31 ----
  endif(FOO_H_1)
  
+ # The HINTS option should override the system but the PATHS option
+ # should not.
+ set(CMAKE_SYSTEM_PREFIX_PATH ${MY_SOURCE_DIR})
+ find_file(TEST_H_1 ${_HEADER} HINTS ${MY_SOURCE_DIR}/A/include)
+ find_file(TEST_H_2 ${_HEADER} PATHS ${MY_SOURCE_DIR}/A/include)
+ if(NOT "${TEST_H_1}" STREQUAL "${_HEADER_FULL_A}")
+    message(FATAL_ERROR "Did not find \"${_HEADER_FULL_A}\"\ngot \"${TEST_H_1}\" instead!")
+ endif(NOT "${TEST_H_1}" STREQUAL "${_HEADER_FULL_A}")
+ if(NOT "${TEST_H_2}" STREQUAL "${_HEADER_FULL}")
+    message(FATAL_ERROR "Did not find \"${_HEADER_FULL}\"\ngot \"${TEST_H_2}\" instead!")
+ endif(NOT "${TEST_H_2}" STREQUAL "${_HEADER_FULL}")
+ set(CMAKE_SYSTEM_PREFIX_PATH)
+ 
  # with this it still should not be found, since the include/ subdir is still missing
  set(CMAKE_INCLUDE_PATH "${MY_SOURCE_DIR}")



More information about the Cmake-commits mailing list