fixed EEPROM user-area space checks for FT232R and FT245R chips in ftdi_eeprom_build()

[libftdi] / ftdi_eeprom / CMakeLists.txt

diff --git a/ftdi_eeprom/CMakeLists.txt b/ftdi_eeprom/CMakeLists.txt
index fff31a8..6c59e2c 100644 (file)
--- a/ftdi_eeprom/CMakeLists.txt
+++ b/ftdi_eeprom/CMakeLists.txt
@@ -1,40 +1,46 @@
-set(FTDI_BUILD_EEPROM False PARENT_SCOPE)
 
 option(FTDI_EEPROM "Build ftdi_eeprom" ON)
 
-if (FTDI_EEPROM)
-    include(FindPkgConfig)
-    pkg_check_modules(Confuse libconfuse)
-    INCLUDE_DIRECTORIES(${Confuse_INCLUDE_DIRS})
-    LINK_DIRECTORIES(${Confuse_LIBRARY_DIRS})
-    SET(libs ${libs} ${Confuse_LIBRARIES})
-
-    if(Confuse_FOUND_DISABLED_FOR_NOW)
-        set(FTDI_BUILD_EEPROM True PARENT_SCOPE)
-        message(STATUS "Building ftdi_eeprom")
-
-        # Version defines
-        set(EEPROM_MAJOR_VERSION 0)
-        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)
-
-        configure_file(
-          "ftdi_eeprom_version.h.in"
-          "${CMAKE_BINARY_DIR}/ftdi_eeprom/ftdi_eeprom_version.h"
-        )
-
-        add_executable(ftdi_eeprom main.c)
-        target_link_libraries(ftdi_eeprom ftdi)
-
-    else(Confuse_FOUND)
-        message(STATUS "libConfuse not found, won't build ftdi_eeprom")
-    endif(Confuse_FOUND)
-
+if ( FTDI_EEPROM )
+  find_package ( Confuse )
+  find_package ( Libintl )
 else(FTDI_EEPROM)
+  message(STATUS "ftdi_eeprom build is disabled")
+endif ()
+
+
+if ( CONFUSE_FOUND )
+  message(STATUS "Building ftdi_eeprom")
+
+  include_directories ( ${CONFUSE_INCLUDE_DIRS} )
+  list ( APPEND libs ${CONFUSE_LIBRARIES} )
+  
+  if ( LIBINTL_FOUND )
+    include_directories ( ${LIBINTL_INCLUDE_DIR} )
+    list ( APPEND libs ${LIBINTL_LIBRARIES} )
+  endif ()
+
+  
+  # Version defines
+  set ( EEPROM_MAJOR_VERSION 0 )
+  set ( EEPROM_MINOR_VERSION 17 )
+  set ( EEPROM_VERSION_STRING ${EEPROM_MAJOR_VERSION}.${EEPROM_MINOR_VERSION} )
+
+  include_directories ( BEFORE ${CMAKE_SOURCE_DIR}/src )
+  include_directories ( BEFORE ${CMAKE_CURRENT_BINARY_DIR} )
+
+  configure_file(
+    ftdi_eeprom_version.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/ftdi_eeprom_version.h
+  )
+
+  add_executable ( ftdi_eeprom main.c )
+  target_link_libraries ( ftdi_eeprom ftdi1 ${CONFUSE_LIBRARIES} )
+  if ( LIBINTL_FOUND )
+    target_link_libraries ( ftdi_eeprom ${LIBINTL_LIBRARIES} )
+  endif ()
+  install ( TARGETS ftdi_eeprom DESTINATION bin )
+else ()
+  message ( STATUS "libConfuse not found, won't build ftdi_eeprom" )
+endif ()
 
-    message(STATUS "ftdi_eeprom build is disabled")
-
-endif(FTDI_EEPROM)