The branch, master has been updated
via 06c863da145d3d0e43cb32a052ddd87b1590c5e3 (commit)
via c143448b10272d9c712ec1682eecc2554f71e1b1 (commit)
via 11bc93d829ed92e617c112b5e4a5138965cca822 (commit)
from a7c32c59a04044e70612b3ea598ab51b2cff3174 (commit)
- Log -----------------------------------------------------------------
commit 06c863da145d3d0e43cb32a052ddd87b1590c5e3
Author: Thomas Jarosch <thomas.jarosch@xxxxxxxxxxxxx>
Date: Tue May 22 15:45:55 2012 +0200
Add Xiaofan Chen to AUTHORS. This was long overdue
commit c143448b10272d9c712ec1682eecc2554f71e1b1
Author: Thomas Jarosch <thomas.jarosch@xxxxxxxxxxxxx>
Date: Tue May 22 15:44:50 2012 +0200
Add Jared Boone to AUTHORS
commit 11bc93d829ed92e617c112b5e4a5138965cca822
Author: Jared Boone <jared@xxxxxxxxxxxxxxxx>
Date: Sat May 12 14:09:40 2012 -0700
Patch for building examples on MacOS X Lion
I had trouble with CMake picking up my /opt/local/include directory before
my libftdi/src directory. I was getting the MacPorts-installed libftdi-0.20
headers, not the headers from the build tree. This was only happening during
building of examples/. This patch addressed my problem.
- Jared
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 2 ++
examples/CMakeLists.txt | 7 ++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 9762dc3..4582db9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -19,6 +19,7 @@ see Changelog for full details:
Evan Nemerson <evan@xxxxxxxxxxxxxxx>
Evgeny Sinelnikov <sin@xxxxxxxx>
Ian Abbott <abbotti@xxxxxxxxx>
+ Jared Boone <jared@xxxxxxxxxxxxxxxx>
Jean-Daniel Merkli <jdmerkli@xxxxxxxxxxxxxxxxxx>
Juergen Beisert <juergen.beisert@xxxxxxxxxxxxxxxxx>
Lorenz Moesenlechner <lorenz@xxxxxxxxxx>
@@ -44,4 +45,5 @@ see Changelog for full details:
Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Vladimir Yakovlev <nagos@xxxxxxxx>
Wilfried Holzke <libftdi@xxxxxxxxxx>
+ Xiaofan Chen <xiaofanc@xxxxxxxxx>
Yi-Shin Li <ysli@xxxxxxxxxxxxx>
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 29646f5..11e5aab 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -8,9 +8,6 @@ if (EXAMPLES)
message(STATUS "Building example programs.")
- # Source includes
- include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src)
-
# Targets
add_executable(simple simple.c)
add_executable(bitbang bitbang.c)
@@ -49,6 +46,10 @@ if (EXAMPLES)
target_link_libraries(find_all_pp ftdipp)
endif(Boost_FOUND)
endif(FTDI_BUILD_CPP)
+
+ # Source includes
+ include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src)
+
else(EXAMPLES)
message(STATUS "Not building example programs.")
endif(EXAMPLES)
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
|
