A library to talk to FTDI chips branch, master, updated. v0.19-6-gdea15ce

[libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx]

The branch, master has been updated
       via  dea15ce4c747c6f35dd5cae0df9cbe41df091292 (commit)
       via  c1c684e15a4321ec1c268a1ea6e2aecf99d7a500 (commit)
      from  e115d5952de491c77ea81b7f69b572192e6074b8 (commit)


- Log -----------------------------------------------------------------
commit dea15ce4c747c6f35dd5cae0df9cbe41df091292
Author: Thomas Jarosch <thomas.jarosch@xxxxxxxxxxxxx>
Date:   Thu Sep 29 15:42:30 2011 +0200

    Prefer local include directories over system wide ones

commit c1c684e15a4321ec1c268a1ea6e2aecf99d7a500
Author: Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date:   Thu Sep 29 14:43:06 2011 +0200

    Add -Wall flag for CMake compilation

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt          |    1 +
 bindings/CMakeLists.txt |    2 +-
 examples/CMakeLists.txt |    2 +-
 ftdipp/CMakeLists.txt   |    4 ++--
 src/CMakeLists.txt      |    2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 339fc54..2fd44f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,7 @@ endif("${CMAKE_BUILD_TYPE}" STREQUAL "")
 set(CMAKE_COLOR_MAKEFILE ON)
 cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
 
+add_definitions(-Wall)
 # Debug build
 message("-- Build type: ${CMAKE_BUILD_TYPE}")
 if(${CMAKE_BUILD_TYPE} STREQUAL Debug)
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}
                      )
 


hooks/post-receive
-- 
A library to talk to FTDI chips

--
libftdi-git - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx