[clfft] 81/109: doc is now generated by cmake (not yet installed)

[Jérôme Kieffer]

This is an automated email from the git hooks/post-receive script.

kieffer-guest pushed a commit to branch debian
in repository clfft.

commit 58a2fae7d11506e88be799c36655a35ec0deaee5
Author: Jerome Kieffer <jerome.kieffer at esrf.fr>
Date:   Tue Apr 21 15:00:57 2015 +0200

    doc is now generated by cmake (not yet installed)
---
 debian/patches/docpath.patch | 56 +++++++++++++++++++++++++++++++++++---------
 debian/rules                 |  7 +++---
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/debian/patches/docpath.patch b/debian/patches/docpath.patch
index 6e7b49c..2c77597 100644
--- a/debian/patches/docpath.patch
+++ b/debian/patches/docpath.patch
@@ -61,7 +61,7 @@
  # where doxygen was started. If left blank the current directory will be used.
  
 -OUTPUT_DIRECTORY       = ../../bin/clFFT.doxy
-+OUTPUT_DIRECTORY       = @CMAKE_CURRENT_BINARY_DIR@
++OUTPUT_DIRECTORY       = @CMAKE_CURRENT_BINARY_DIR@/doc
  
 -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 -# 4096 sub-directories (in 2 levels) under the output directory of each output 
@@ -2759,18 +2759,52 @@
  	set( CMAKE_CXX_FLAGS "-pthread ${CMAKE_CXX_FLAGS}" )
  	set( CMAKE_C_FLAGS "-pthread ${CMAKE_C_FLAGS}" )
  
-@@ -309,3 +309,14 @@
+@@ -309,3 +309,48 @@
  
  # Define all variables that influence CPack before including CPack, such as install targets
  include( CPack )
 +
 +# add a target to generate API documentation with Doxygen
-+find_package(Doxygen)
-+if(DOXYGEN_FOUND)
-+configure_file(${PROJECT_SOURCE_DIR}/../doc/clFFT.doxy ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
-+add_custom_target(doc
-+${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-+WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-+COMMENT "Generating API documentation with Doxygen" VERBATIM
-+)
-+endif(DOXYGEN_FOUND)
++#find_package(Doxygen)
++#if(DOXYGEN_FOUND)
++#configure_file(${PROJECT_SOURCE_DIR}/../doc/clFFT.doxy ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
++#add_custom_target(doc
++#${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
++#WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
++#COMMENT "Generating API documentation with Doxygen" VERBATIM
++#)
++#endif(DOXYGEN_FOUND)
++
++option(BUILD_DOCUMENTATION "Create and install the HTML based API documentation (requires Doxygen)" ON)
++IF(BUILD_DOCUMENTATION)
++ 
++  FIND_PACKAGE(Doxygen)
++  IF(NOT DOXYGEN_FOUND)
++    MESSAGE(FATAL_ERROR
++      "Doxygen is needed to build the documentation.")
++  ENDIF()
++ 
++  SET( doxyfile_in          ${PROJECT_SOURCE_DIR}/../doc/clFFT.doxy     )
++  SET( doxyfile             ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile        )
++  SET( doxy_html_index_file ${CMAKE_CURRENT_BINARY_DIR}/doc/html/index.html )
++  SET( doxy_output_root     ${CMAKE_CURRENT_BINARY_DIR}/doc             ) # Pasted into Doxyfile.in
++  SET( doxy_input           ${PROJECT_SOURCE_DIR}/src                   ) # Pasted into Doxyfile.in
++  SET( doxy_extra_files     ${PROJECT_SOURCE_DIR}/../doc/*.jpg          ) # Pasted into Doxyfile.in
++ 
++  CONFIGURE_FILE( ${doxyfile_in} ${doxyfile} @ONLY )
++ 
++  ADD_CUSTOM_COMMAND( OUTPUT ${doxy_html_index_file}
++                      COMMAND ${DOXYGEN_EXECUTABLE} ${doxyfile}
++                      # The following should be ${doxyfile} only but it
++                      # will break the dependency.
++                      # The optimal solution would be creating a
++                      # custom_command for ${doxyfile} generation
++                      # but I still have to figure out how...
++                      MAIN_DEPENDENCY ${doxyfile} ${doxyfile_in}
++                      #DEPENDS project_targets ${doxy_extra_files}
++                      COMMENT "Generating HTML documentation")
++ 
++  ADD_CUSTOM_TARGET( doc ALL DEPENDS ${doxy_html_index_file} )
++ 
++  INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION share/doc )
++ENDIF()
diff --git a/debian/rules b/debian/rules
index 45fd884..90e749c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,8 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 %:
 	dh $@ --buildsystem cmake --parallel --sourcedirectory=src --dbg-package=libclfft2-dbg
 
-#override_dh_installdocs:
-#	doxygen doc/clFFT.doxy
-#	dh_installdocs
+#override_dh_auto_build:
+	#doxygen doc/clFFT.doxy
+#	dh_auto_build
+#	$(MAKE) doc
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clfft.git