X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=examples%2FCMakeLists.txt;h=1263c6260ddbb13d484b89c8f45bf4bfcb45a702;hp=d8be6f5dea8019103655f6cd49deeb96a9c25be0;hb=d160863c527c8a3fdf1e821a64c59192a2fc2150;hpb=2db3a766fd94a852d95f46efadf3a0dacccd29f5

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index d8be6f5..1263c62 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -2,15 +2,12 @@ option(EXAMPLES "Build example programs" ON)
 
 if (EXAMPLES)
     # Includes
-    include( ${CMAKE_CURRENT_SOURCE_DIR}
+    include_directories( ${CMAKE_CURRENT_SOURCE_DIR}
             ${CMAKE_CURRENT_BINARY_DIR}
             )
 
     message(STATUS "Building example programs.")
 
-    # Source includes
-    include_directories(${CMAKE_SOURCE_DIR}/src)
-
     # Targets
     add_executable(simple simple.c)
     add_executable(bitbang bitbang.c)
@@ -18,37 +15,41 @@ if (EXAMPLES)
     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(stream_test ftdi)
-    target_link_libraries(eeprom 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)
         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
             add_executable(find_all_pp find_all_pp.cpp)
 
             # Linkage
-            target_link_libraries(find_all_pp ftdipp)
+            target_link_libraries(find_all_pp ftdipp1)
         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)