libftdi-git Archives

Subject: A library to talk to FTDI chips branch, master, updated. v1.2-23-gc4c9f0a

From: libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx
To: libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx
Date: Fri, 20 Nov 2015 23:55:56 +0100 (CET)
The branch, master has been updated
       via  c4c9f0ae4960a862b486aaf45872c25d288958a5 (commit)
      from  37bc427cf696a4bdaf222fed7161d99cee51eb0f (commit)


- Log -----------------------------------------------------------------
commit c4c9f0ae4960a862b486aaf45872c25d288958a5
Author: Thomas Jarosch <thomas.jarosch@xxxxxxxxxxxxx>
Date:   Fri Nov 20 23:54:56 2015 +0100

    Install example config for ftdi_eeprom in docdir
    
    Feature request and initial patch from Fabio Rossi.

-----------------------------------------------------------------------

Summary of changes:
 ftdi_eeprom/CMakeLists.txt |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ftdi_eeprom/CMakeLists.txt b/ftdi_eeprom/CMakeLists.txt
index 6c59e2c..a730ee3 100644
--- a/ftdi_eeprom/CMakeLists.txt
+++ b/ftdi_eeprom/CMakeLists.txt
@@ -1,3 +1,12 @@
+# determine docdir
+include(GNUInstallDirs)
+if(NOT CMAKE_INSTALL_DOCDIR)
+  if(WIN32)
+    set(CMAKE_INSTALL_DOCDIR .)
+  else(WIN32)
+    set(CMAKE_INSTALL_DOCDIR ${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME})
+  endif(WIN32)
+endif(NOT CMAKE_INSTALL_DOCDIR)
 
 option(FTDI_EEPROM "Build ftdi_eeprom" ON)
 
@@ -14,13 +23,13 @@ if ( CONFUSE_FOUND )
 
   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 )
@@ -40,7 +49,7 @@ if ( CONFUSE_FOUND )
     target_link_libraries ( ftdi_eeprom ${LIBINTL_LIBRARIES} )
   endif ()
   install ( TARGETS ftdi_eeprom DESTINATION bin )
+  install ( FILES example.conf DESTINATION ${CMAKE_INSTALL_DOCDIR} )
 else ()
   message ( STATUS "libConfuse not found, won't build ftdi_eeprom" )
 endif ()
-


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   

Current Thread
  • A library to talk to FTDI chips branch, master, updated. v1.2-23-gc4c9f0a, libftdi-git <=