X-Git-Url: http://developer.intra2net.com/git/?a=blobdiff_plain;f=ftdi_eeprom%2FCMakeLists.txt;h=a843b8e6c85225cd44c73b8791e946771aa3e77c;hb=afb9082460cf8602b1843e1a698ec498e3d38d7b;hp=fff31a855e1ffe283141cf2c68dd3bc9f8ca8aa2;hpb=ade814a59b4660c5af865dd86cdd48cfa55e1ae5;p=libftdi

diff --git a/ftdi_eeprom/CMakeLists.txt b/ftdi_eeprom/CMakeLists.txt
index fff31a8..a843b8e 100644
--- a/ftdi_eeprom/CMakeLists.txt
+++ b/ftdi_eeprom/CMakeLists.txt
@@ -9,7 +9,7 @@ if (FTDI_EEPROM)
     LINK_DIRECTORIES(${Confuse_LIBRARY_DIRS})
     SET(libs ${libs} ${Confuse_LIBRARIES})
 
-    if(Confuse_FOUND_DISABLED_FOR_NOW)
+    if(Confuse_FOUND)
         set(FTDI_BUILD_EEPROM True PARENT_SCOPE)
         message(STATUS "Building ftdi_eeprom")
 
@@ -18,8 +18,8 @@ if (FTDI_EEPROM)
         set(EEPROM_MINOR_VERSION 17)
         set(EEPROM_VERSION_STRING ${EEPROM_MAJOR_VERSION}.${EEPROM_MINOR_VERSION})
 
-        include_directories(${CMAKE_SOURCE_DIR}/src)
-        include_directories(${CMAKE_BINARY_DIR}/ftdi_eeprom)
+        include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src)
+        include_directories(BEFORE ${CMAKE_BINARY_DIR}/ftdi_eeprom)
 
         configure_file(
           "ftdi_eeprom_version.h.in"
@@ -27,7 +27,10 @@ if (FTDI_EEPROM)
         )
 
         add_executable(ftdi_eeprom main.c)
-        target_link_libraries(ftdi_eeprom ftdi)
+        target_link_libraries(ftdi_eeprom ftdi1)
+        target_link_libraries(ftdi_eeprom ${Confuse_LIBRARIES})
+
+        install(TARGETS ftdi_eeprom DESTINATION bin)
 
     else(Confuse_FOUND)
         message(STATUS "libConfuse not found, won't build ftdi_eeprom")