adding doxygen for combiner modules

gammacombo · Oct 16, 2014 · 55d805c · 55d805c
1 parent e1b1929
commit 55d805c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,6 +23,7 @@ ENDIF()
 LIST( APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
 INCLUDE(settings)
 INCLUDE(macros)
+INCLUDE(combiners)
 
 # find ROOT
 FIND_PACKAGE(ROOT REQUIRED)
@@ -49,14 +50,24 @@ ENDIF()
 FIND_PACKAGE(Doxygen)
 
 if(DOXYGEN_FOUND)
-    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/doc/Doxyfile @ONLY)
-
-    ADD_CUSTOM_TARGET(doc
-        ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doc/Doxyfile
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc
-        COMMENT "Generating API documentation with Doxygen" VERBATIM)
+	# add combiner modules to Doxygen
+	set(COMBINER_MODULES_DOXYGEN_SOURCES)
+	foreach( dir ${COMBINER_MODULES} )
+		set(COMBINER_MODULES_DOXYGEN_SOURCES "${COMBINER_MODULES_DOXYGEN_SOURCES} 
+			INPUT += ${CMAKE_CURRENT_SOURCE_DIR}/${dir}/include
+			INPUT += ${CMAKE_CURRENT_SOURCE_DIR}/${dir}/src"
+		)
+	endforeach()
+	# configure Doxygen config file
+	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/doc/Doxyfile @ONLY)
+	# add target
+	ADD_CUSTOM_TARGET(doc
+		${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doc/Doxyfile
+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc
+		COMMENT "Generating API documentation with Doxygen" VERBATIM
+	)
 ELSE()
-    MESSAGE( STATUS "Doxygen not installed or found -- API documentation can't be generated!" )
+	MESSAGE( STATUS "Doxygen not installed or found -- API documentation can't be generated!" )
 ENDIF(DOXYGEN_FOUND)
 
 ######################################
@@ -162,7 +173,6 @@ TARGET_LINK_LIBRARIES( ${PROJECT_NAME}Components ${ROOT_LIBRARIES} )
 #
 ######################################
 
-include( combiners )
 foreach( dir ${COMBINER_MODULES} )
 	add_subdirectory(${dir})
 endforeach()

diff --git a/cmake/combiners.cmake b/cmake/combiners.cmake
@@ -12,10 +12,10 @@
 
 SET( COMBINER_MODULES
 	tutorial
-	#gammacombo
-	#hfag
+	gammacombo
+	hfag
 	bsmumu
-	#biggammacombo
+	biggammacombo
 	# add your combiners here
 )
 
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
@@ -677,8 +677,7 @@ WARN_LOGFILE           =
 
 INPUT = @CMAKE_CURRENT_SOURCE_DIR@/core/src
 INPUT += @CMAKE_CURRENT_SOURCE_DIR@/core/include
-INPUT += @CMAKE_CURRENT_SOURCE_DIR@/tutorial/include
-INPUT += @CMAKE_CURRENT_SOURCE_DIR@/tutorial/src
+@COMBINER_MODULES_DOXYGEN_SOURCES@
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is