[llvm] r189506 - [cmake] Created an aggregate doxygen target for generating doxygen documentation for llvm/all subprojects. Renamed llvm's doxygen generation command to doxygen-llvm.

[Michael Gottesman]

Author: mgottesman
Date: Wed Aug 28 15:28:32 2013
New Revision: 189506

URL: http://llvm.org/viewvc/llvm-project?rev=189506&view=rev
Log:
[cmake] Created an aggregate doxygen target for generating doxygen documentation for llvm/all subprojects. Renamed llvm's doxygen generation command to doxygen-llvm.

Modified:
    llvm/trunk/cmake/config-ix.cmake
    llvm/trunk/docs/CMakeLists.txt

Modified: llvm/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=189506&r1=189505&r2=189506&view=diff
==============================================================================
--- llvm/trunk/cmake/config-ix.cmake (original)
+++ llvm/trunk/cmake/config-ix.cmake Wed Aug 28 15:28:32 2013
@@ -465,6 +465,15 @@ set(LLVM_PREFIX ${CMAKE_INSTALL_PREFIX})
 if (LLVM_ENABLE_DOXYGEN)
   message(STATUS "Doxygen enabled.")
   find_package(Doxygen)
+
+  if (DOXYGEN_FOUND)
+    # If we find doxygen and we want to enable doxygen by default create a
+    # global aggregate doxygen target for generating llvm and any/all
+    # subprojects doxygen documentation.
+    if (LLVM_BUILD_DOCS)
+      add_custom_target(doxygen ALL)
+    endif()
+  endif()
 else()
   message(STATUS "Doxygen disabled.")
 endif()

Modified: llvm/trunk/docs/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CMakeLists.txt?rev=189506&r1=189505&r2=189506&view=diff
==============================================================================
--- llvm/trunk/docs/CMakeLists.txt (original)
+++ llvm/trunk/docs/CMakeLists.txt Wed Aug 28 15:28:32 2013
@@ -1,8 +1,4 @@
 
-if (LLVM_BUILD_DOCS)
-  set(LLVM_DOCS_ADD_TO_ALL ALL)
-endif()
-
 if (DOXYGEN_FOUND)
 if (LLVM_ENABLE_DOXYGEN)
   set(abs_top_srcdir ${LLVM_MAIN_SRC_DIR})
@@ -18,10 +14,14 @@ if (LLVM_ENABLE_DOXYGEN)
   set(abs_top_builddir)
   set(DOT)
 
-  add_custom_target(doxygen ${LLVM_DOCS_ADD_TO_ALL}
+  add_custom_target(doxygen-llvm
     COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    COMMENT "Generating doxygen documentation." VERBATIM)
+    COMMENT "Generating llvm doxygen documentation." VERBATIM)
+
+  if (LLVM_BUILD_DOCS)
+    add_dependencies(doxygen doxygen-llvm)
+  endif()
 
   if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
     install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doxygen/html