From a104ad3dacd3390302799cdaf6ad4ee2bf08a7a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Lallement?= <raphael.lallement@laas.fr> Date: Tue, 9 Sep 2014 14:41:17 +0200 Subject: [PATCH] [wip/hatponboard-lib] Make the documentation generation an option --- hatponboard-lib/Makefile | 10 ++++++++-- hatponboard-lib/patches/patch-aa | 13 +++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 hatponboard-lib/patches/patch-aa diff --git a/hatponboard-lib/Makefile b/hatponboard-lib/Makefile index 10598498..1df32e23 100644 --- a/hatponboard-lib/Makefile +++ b/hatponboard-lib/Makefile @@ -4,7 +4,7 @@ DISTNAME= hatponboard-lib-${VERSION} VERSION= 2.1.4 -PKGREVISION= +PKGREVISION= 1 CATEGORIES= planning MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=hatponboard-lib/} MASTER_REPOSITORY= ${MASTER_REPOSITORY_OPENROBOTS}hatp/hatponboard-lib @@ -19,6 +19,13 @@ MAKE_JOBS_SAFE= yes DEPEND_ABI.boost-libs=boost-libs>=1.34 DEPEND_ABI.boost-headers=boost-headers>=1.34 +PKG_SUPPORTED_OPTIONS+= doc +PKG_OPTION_DESCR.doc= Enable the documentation generation + +define PKG_OPTION_SET.doc + include ../../mk/sysdep/doxygen.mk +endef + # Find Antlr binary name and pass it to CMake CMAKE_ARGS+= -DAntlr_INCLUDE=${ANTLR_INCLUDE} -DAntlr_BIN=${ANTLR_BIN} -DAntlr_LIB=${ANTLR_LIB} @@ -26,7 +33,6 @@ include ../../devel/boost-headers/depend.mk include ../../devel/boost-libs/depend.mk include ../../wip/antlr2/depend.mk include ../../mk/sysdep/cmake.mk -include ../../mk/sysdep/doxygen.mk include ../../mk/language/c.mk include ../../mk/language/c++.mk include ../../mk/robotpkg.mk diff --git a/hatponboard-lib/patches/patch-aa b/hatponboard-lib/patches/patch-aa new file mode 100644 index 00000000..c173b241 --- /dev/null +++ b/hatponboard-lib/patches/patch-aa @@ -0,0 +1,13 @@ +diff --git CMakeLists.txt CMakeLists.txt +index 0107cfe..9024d3f 100644 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -61,7 +61,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/share/uninstall.cmake.in ${CMAKE_BINA + add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/uninstall.cmake) + + #Documentation +-find_package(Doxygen REQUIRED) ++find_package(Doxygen) + if(DOXYGEN_FOUND) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${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) -- GitLab