[llvm-branch-commits] [clang-tools-extra-branch] r258955 - Merging r258924:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Jan 27 11:57:45 2016
New Revision: 258955

URL: http://llvm.org/viewvc/llvm-project?rev=258955&view=rev
Log:
Merging r258924:
------------------------------------------------------------------------
r258924 | alexfh | 2016-01-27 03:37:08 -0800 (Wed, 27 Jan 2016) | 1 line

Add clang-tools-extra documentation to the CMake build.
------------------------------------------------------------------------

Added:
    clang-tools-extra/branches/release_38/docs/CMakeLists.txt
      - copied unchanged from r258924, clang-tools-extra/trunk/docs/CMakeLists.txt
    clang-tools-extra/branches/release_38/docs/doxygen.cfg.in
      - copied unchanged from r258924, clang-tools-extra/trunk/docs/doxygen.cfg.in
    clang-tools-extra/branches/release_38/docs/doxygen.intro
      - copied unchanged from r258924, clang-tools-extra/trunk/docs/doxygen.intro
Modified:
    clang-tools-extra/branches/release_38/   (props changed)
    clang-tools-extra/branches/release_38/CMakeLists.txt

Propchange: clang-tools-extra/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 27 11:57:45 2016
@@ -1 +1 @@
-/clang-tools-extra/trunk:258327,258356
+/clang-tools-extra/trunk:258327,258356,258924

Modified: clang-tools-extra/branches/release_38/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/branches/release_38/CMakeLists.txt?rev=258955&r1=258954&r2=258955&view=diff
==============================================================================
--- clang-tools-extra/branches/release_38/CMakeLists.txt (original)
+++ clang-tools-extra/branches/release_38/CMakeLists.txt Wed Jan 27 11:57:45 2016
@@ -15,3 +15,10 @@ if(CLANG_ENABLE_STATIC_ANALYZER AND CLAN
 add_subdirectory(test)
 add_subdirectory(unittests)
 endif()
+
+option(CLANG_TOOLS_EXTRA_INCLUDE_DOCS "Generate build targets for the Clang Extra Tools docs."
+  ${LLVM_INCLUDE_DOCS})
+if( CLANG_TOOLS_EXTRA_INCLUDE_DOCS )
+  add_subdirectory(docs)
+endif()
+