X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=examples%2FCMakeLists.txt;h=97ab096136000faf9c08884c9e99490e3eeedb15;hp=2a8ee39c88f09deb9c36a2d4a24f5c0b554ac1a8;hb=68d2167bc5ed5b87c4e41896647b7a25ca7c4062;hpb=e0aca3fac598e0ee54952d24ca32aa2507de1066

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 2a8ee39..97ab096 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,10 +1,7 @@
 # Includes
-include( ${CMAKE_CURRENT_SOURCE_DIR}
-         ${CMAKE_CURRENT_BINARY_DIR}
-         )
-
-# Source includes
-include_directories(${CMAKE_SOURCE_DIR}/src)
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}
+		${CMAKE_CURRENT_BINARY_DIR}
+		)
 
 # Targets
 add_executable(simple simple.c)
@@ -13,27 +10,34 @@ add_executable(bitbang2 bitbang2.c)
 add_executable(bitbang_cbus bitbang_cbus.c)
 add_executable(bitbang_ft2232 bitbang_ft2232.c)
 add_executable(find_all find_all.c)
-add_executable(serial_read serial_read.c)
+add_executable(serial_test serial_test.c)
 add_executable(baud_test baud_test.c)
+add_executable(stream_test stream_test.c)
+add_executable(eeprom eeprom.c)
 
 # Linkage
-target_link_libraries(simple ftdi)
-target_link_libraries(bitbang ftdi)
-target_link_libraries(bitbang2 ftdi)
-target_link_libraries(bitbang_cbus ftdi)
-target_link_libraries(bitbang_ft2232 ftdi)
-target_link_libraries(find_all ftdi)
-target_link_libraries(serial_read ftdi)
-target_link_libraries(baud_test ftdi)
+target_link_libraries(simple ftdi1)
+target_link_libraries(bitbang ftdi1)
+target_link_libraries(bitbang2 ftdi1)
+target_link_libraries(bitbang_cbus ftdi1)
+target_link_libraries(bitbang_ft2232 ftdi1)
+target_link_libraries(find_all ftdi1)
+target_link_libraries(serial_test ftdi1)
+target_link_libraries(baud_test ftdi1)
+target_link_libraries(stream_test ftdi1)
+target_link_libraries(eeprom ftdi1)
 
 # libftdi++ examples
-if(FTDI_BUILD_CPP)
-   message(STATUS "Building libftdi++ examples.")
-   include_directories(${CMAKE_SOURCE_DIR}/ftdipp)
+if( FTDIPP )
+	include_directories(BEFORE ${CMAKE_SOURCE_DIR}/ftdipp
+			${Boost_INCLUDE_DIRS})
 
-   # Targest
-   add_executable(find_all_pp find_all_pp.cpp)
+	# Target
+	add_executable(find_all_pp find_all_pp.cpp)
 
-   # Linkage
-   target_link_libraries(find_all_pp ftdipp)
-endif()
+	# Linkage
+	target_link_libraries(find_all_pp ftdipp1)
+endif( FTDIPP )
+
+# Source includes
+include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src)