The branch, libftdi-0.x has been updated
via 54357fa1aa137a89725cfe34f24cf6c82d5a5d73 (commit)
via bc96abce425216ec3cdfe11723d5d47787ea6fd6 (commit)
from a0705b2bd42a3510211c7710c203e8bee2ed913a (commit)
- Log -----------------------------------------------------------------
commit 54357fa1aa137a89725cfe34f24cf6c82d5a5d73
Author: Thomas Jarosch <thomas.jarosch@xxxxxxxxxxxxx>
Date: Tue May 22 15:44:50 2012 +0200
Add Jared Boone to AUTHORS
commit bc96abce425216ec3cdfe11723d5d47787ea6fd6
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 | 1 +
examples/CMakeLists.txt | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 5b27607..a4a4e29 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,6 +21,7 @@ see Changelog for full details:
Flynn Marquardt <ftdi@xxxxxxxxxx>
Hermann Kraus <herm@xxxxxxxxxxxx>
Ian Abbott <abbotti@xxxxxxxxx>
+ Jared Boone <jared@xxxxxxxxxxxxxxxx>
Jean-Daniel Merkli <jdmerkli@xxxxxxxxxxxxxxxxxx>
Juergen Beisert <juergen.beisert@xxxxxxxxxxxxxxxxx>
Lorenz Moesenlechner <lorenz@xxxxxxxxxx>
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 69530a4..bc35229 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)
@@ -42,6 +39,10 @@ if (EXAMPLES)
# Linkage
target_link_libraries(find_all_pp ftdipp)
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
|
