Merge pull request #498 from SCOREC/apw/update-doxygen

Update doxygen configuration files

Author: cwsmith

CMakeLists.txt

@@ -100,29 +100,6 @@ add_custom_target(check
   COMMAND ${CMAKE_CTEST_COMMAND} -L SMOKE_TEST
   COMMENT "running a smoke test on the installed binaries")
 
-# Set options for doxygen documentation
-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
-)
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile_internal.in
-  ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_internal @ONLY
-)
-add_custom_target(docInternal
-  ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_internal
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-  COMMENT "Generating Internal API documentation with Doxygen" VERBATIM
-)
-endif()
-
 set(Trilinos_PREFIX "" CACHE STRING "Trilinos installation directory")
 
 option(SKIP_SIMMETRIX_VERSION_CHECK "enable at your own risk; it may result in undefined behavior" OFF)
@@ -145,11 +122,22 @@ if(ENABLE_FPP)
 endif()
 
 macro(scorec_export_library target)
-bob_export_target(${target})
-install(FILES ${HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-target_include_directories(${target} INTERFACE
-  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-)
+  bob_export_target(${target})
+  install(FILES ${HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  target_include_directories(${target} INTERFACE
+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+  )
+  # Collect HEADERS for Doxygen
+  list(TRANSFORM HEADERS
+    PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/"
+    OUTPUT_VARIABLE ${target}_HEADERS
+  )
+  list(APPEND DOXYGEN_INPUTS ${${target}_HEADERS})
+  if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+    set(DOXYGEN_INPUTS "${DOXYGEN_INPUTS}" PARENT_SCOPE)
+    list(APPEND DOXYGEN_INTERNAL_INPUTS "${CMAKE_CURRENT_SOURCE_DIR}")
+    set(DOXYGEN_INTERNAL_INPUTS "${DOXYGEN_INTERNAL_INPUTS}" PARENT_SCOPE)
+  endif()
 endmacro(scorec_export_library)
 
 if(ENABLE_SIMMETRIX)
@@ -226,4 +214,29 @@ if(PUMI_PYTHON_INTERFACE)
   add_subdirectory(python_wrappers)
 endif()
 
+# Set options for doxygen documentation
+find_package(Doxygen)
+if(DOXYGEN_FOUND)
+  list(JOIN DOXYGEN_INPUTS " \\\n" DOXYGEN_INPUT)
+  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
+  )
+  list(JOIN DOXYGEN_INTERNAL_INPUTS " \\\n" DOXYGEN_INTERNAL_INPUT)
+  configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile_internal.in
+    ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_internal @ONLY
+  )
+  add_custom_target(docInternal
+    ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_internal
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMENT "Generating Internal API documentation with Doxygen" VERBATIM
+  )
+endif()
+
 bob_end_package()