libftdi-git Archives

Subject: A library to talk to FTDI chips branch, master, updated. v1.1-1-g16257d6

From: libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx
To: libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx
Date: Wed, 5 Mar 2014 16:56:55 +0100 (CET)
The branch, master has been updated
       via  16257d60fb84f09b0d66ad881fe47e7b6faa84ef (commit)
      from  dbf7c343244bb49cf5e287ca476b2f308fc0cef9 (commit)


- Log -----------------------------------------------------------------
commit 16257d60fb84f09b0d66ad881fe47e7b6faa84ef
Author: xantares 09 <xantares09@xxxxxxxxxxx>
Date:   Fri Feb 28 12:41:57 2014 +0000

    enable doxygen docstrings
    
    Hi,
    
    I noticed doxygen docstrings were generated but not included anymore in the 
swig bindings
    since CMAKE_SWIG_FLAGS should be defined before the call to swig_add_module.
    
    Here's a patch.

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

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

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 1073ed3..8b52745 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -22,6 +22,9 @@ if ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
   include_directories ( ${PYTHON_INCLUDE_DIRS} )
   link_directories ( ${CMAKE_CURRENT_BINARY_DIR}/../src )
 
+  if ( DOCUMENTATION AND DOXYGEN_FOUND )
+    set(CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})
+  endif()
   swig_add_module ( ftdi1 python ftdi1.i )
   swig_link_libraries ( ftdi1 ftdi1 )
 
@@ -46,9 +49,6 @@ if ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
   install ( TARGETS ${SWIG_MODULE_ftdi1_REAL_NAME} LIBRARY DESTINATION 
${PYTHON_MODULE_PATH} )
 
   if ( DOCUMENTATION AND DOXYGEN_FOUND )
-
-      set(CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})
-
       # Run doxygen to only generate the xml
       add_custom_command ( OUTPUT ${CMAKE_BINARY_DIR}/doc/xml/ftdi_8c.xml
           COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/doc


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.1-1-g16257d6, libftdi-git <=