From dea15ce4c747c6f35dd5cae0df9cbe41df091292 Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Thu, 29 Sep 2011 15:42:30 +0200 Subject: [PATCH] Prefer local include directories over system wide ones --- bindings/CMakeLists.txt | 2 +- examples/CMakeLists.txt | 2 +- ftdipp/CMakeLists.txt | 4 ++-- src/CMakeLists.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt index 573e51b..85b61a7 100644 --- a/bindings/CMakeLists.txt +++ b/bindings/CMakeLists.txt @@ -5,7 +5,7 @@ include(UseSWIG) option(PYTHON_BINDINGS "Build python bindings via swig" ON) if(PYTHON_BINDINGS AND SWIG_FOUND AND PYTHONLIBS_FOUND) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src) + INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/src) INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}) SWIG_ADD_MODULE(ftdi python ftdi.i) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index e80872c..69530a4 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -9,7 +9,7 @@ if (EXAMPLES) message(STATUS "Building example programs.") # Source includes - include_directories(${CMAKE_SOURCE_DIR}/src) + include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src) # Targets add_executable(simple simple.c) diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt index 2f6a7b0..c9d2361 100644 --- a/ftdipp/CMakeLists.txt +++ b/ftdipp/CMakeLists.txt @@ -6,9 +6,9 @@ option(FTDIPP "Build C++ binding library libftdi++" ON) if (FTDIPP) # Includes - include_directories( ${CMAKE_CURRENT_BINARY_DIR} + include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../src + ${CMAKE_SOURCE_DIR}/src ) # Targets diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4590c58..071ae90 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ # Includes -include_directories( ${CMAKE_CURRENT_BINARY_DIR} +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ) -- 1.7.1