Updated doxygen handling

hbristow · Apr 6, 2013 · 61e7b1c · 61e7b1c
1 parent e48407f
commit 61e7b1c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -52,9 +52,7 @@ add_subdirectory(src)
 
 # build the doxygen pdf
 if(BUILD_DOC)
-    find_package(Doxygen)
-    configure_file(${PROJECT_SOURCE_DIR}/doc/Doxyfile.in ${PROJECT_SOURCE_DIR}/doc/Doxyfile @ONLY)
-    add_custom_target(cvmatio_doc ALL ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/doc/Doxyfile)
+    add_subdirectory(doc)
 endif()
 
 # configuration summary

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -0,0 +1,7 @@
+find_package(Doxygen)
+if (DOXYGEN_FOUND)
+    configure_file(${PROJECT_SOURCE_DIR}/doc/Doxyfile.in ${PROJECT_SOURCE_DIR}/doc/Doxyfile @ONLY)
+    add_custom_target(cvmatio_doc ALL ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/doc/Doxyfile)
+else()
+    set(BUILD_DOC OFF PARENT_SCOPE)
+endif()