Fix include directories: Prefer local (probably newer) ftdi.h instead of the already...

diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
index 5333035..4d6f94d 100644 (file)
--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@@ -5,10 +5,10 @@ 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})
     LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../src)
-    
+
     SWIG_ADD_MODULE(ftdi python ftdi.i)
     SWIG_LINK_LIBRARIES(ftdi ftdi ${PYTHON_LIBRARIES})
 

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 10ed02b..29646f5 100644 (file)
--- 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)
@@ -39,7 +39,7 @@ if (EXAMPLES)
     if(FTDI_BUILD_CPP)
         if(Boost_FOUND)
             message(STATUS "Building libftdi++ examples.")
-            include_directories(${CMAKE_SOURCE_DIR}/ftdipp
+            include_directories(BEFORE ${CMAKE_SOURCE_DIR}/ftdipp
                                 ${Boost_INCLUDE_DIRS})
 
             # Target

diff --git a/ftdi_eeprom/CMakeLists.txt b/ftdi_eeprom/CMakeLists.txt
index 3f1d7dc..38d7a96 100644 (file)
--- a/ftdi_eeprom/CMakeLists.txt
+++ b/ftdi_eeprom/CMakeLists.txt
@@ -18,8 +18,8 @@ if (FTDI_EEPROM)
         set(EEPROM_MINOR_VERSION 17)
         set(EEPROM_VERSION_STRING ${EEPROM_MAJOR_VERSION}.${EEPROM_MINOR_VERSION})
 
-        include_directories(${CMAKE_SOURCE_DIR}/src)
-        include_directories(${CMAKE_BINARY_DIR}/ftdi_eeprom)
+        include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src)
+        include_directories(BEFORE ${CMAKE_BINARY_DIR}/ftdi_eeprom)
 
         configure_file(
           "ftdi_eeprom_version.h.in"

diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt
index 43057ce..ced58b3 100644 (file)
--- a/ftdipp/CMakeLists.txt
+++ b/ftdipp/CMakeLists.txt
@@ -8,10 +8,11 @@ if (FTDIPP)
     if(Boost_FOUND)
 
         # Includes
-        include_directories(${Boost_INCLUDE_DIRS}
-                            ${CMAKE_CURRENT_BINARY_DIR}
+        include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}
                             ${CMAKE_CURRENT_SOURCE_DIR}
-                            ${CMAKE_CURRENT_SOURCE_DIR}/../src)
+                            ${CMAKE_SOURCE_DIR}/src)
+
+        include_directories(${Boost_INCLUDE_DIRS})
 
         # Targets
         set(cpp_sources   ftdi.cpp)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a4da870..0816341 100644 (file)
--- 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}
                      )