[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.10 1.11

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Nov 9 13:38:31 EST 2009


Update of /cvsroot/CMake/CMake/Utilities/cmlibarchive
In directory public:/mounts/ram/cvs-serv16478/Utilities/cmlibarchive

Modified Files:
	CMakeLists.txt 
Log Message:
libarchive: Put local include dir first

In libarchive we configure an internal header file called 'config.h'.
This commits moves the include directory containing the file to the
beginning of the include path to avoid conflicts from system headers.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/CMakeLists.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** CMakeLists.txt	5 Nov 2009 21:29:29 -0000	1.10
--- CMakeLists.txt	9 Nov 2009 18:38:29 -0000	1.11
***************
*** 699,703 ****
  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in
      ${CMAKE_CURRENT_BINARY_DIR}/config.h)
! INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
  ADD_DEFINITIONS(-DHAVE_CONFIG_H)
  
--- 699,703 ----
  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in
      ${CMAKE_CURRENT_BINARY_DIR}/config.h)
! INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
  ADD_DEFINITIONS(-DHAVE_CONFIG_H)
  



More information about the Cmake-commits mailing list