Prefer local include directories over system wide ones
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 29 Sep 2011 13:42:30 +0000 (15:42 +0200)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 29 Sep 2011 13:42:30 +0000 (15:42 +0200)
bindings/CMakeLists.txt
examples/CMakeLists.txt
ftdipp/CMakeLists.txt
src/CMakeLists.txt

index 573e51b..85b61a7 100644 (file)
@@ -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)
index e80872c..69530a4 100644 (file)
@@ -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)
index 2f6a7b0..c9d2361 100644 (file)
@@ -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
index 4590c58..071ae90 100644 (file)
@@ -1,5 +1,5 @@
 # Includes
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}
                      ${CMAKE_CURRENT_SOURCE_DIR}
                      )