From 9c50cf0c6d8f0b11cd76a28cc4ef9bca6ef732e0 Mon Sep 17 00:00:00 2001

From: Tom Stellard <tstellar@redhat.com>

Date: Tue, 9 May 2017 01:41:28 +0000

Subject: [PATCH] Revert "Revert "CMake: Move sphinx detection into

 AddSphinxTarget.cmake""

This reverts commit r302054.

Re-commit now that I have fixes for clang/lld.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@302499 91177308-0d34-0410-b5e6-96231b3b80d8

---

 cmake/config-ix.cmake               | 10 ----------

 cmake/modules/AddSphinxTarget.cmake | 13 +++++++++++++

 docs/CMakeLists.txt                 |  2 +-

 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake

index 0331d0f..de8e9bf 100755

--- a/cmake/config-ix.cmake

+++ b/cmake/config-ix.cmake

@@ -530,16 +530,6 @@ else()

   message(STATUS "Doxygen disabled.")

 endif()

-if (LLVM_ENABLE_SPHINX)

-  message(STATUS "Sphinx enabled.")

-  find_package(Sphinx REQUIRED)

-  if (LLVM_BUILD_DOCS)

-    add_custom_target(sphinx ALL)

-  endif()

-else()

-  message(STATUS "Sphinx disabled.")

-endif()

-

 set(LLVM_BINDINGS "")

 if(WIN32)

   message(STATUS "Go bindings disabled.")

diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake

index cfc7f38..c3a676d 100644

--- a/cmake/modules/AddSphinxTarget.cmake

+++ b/cmake/modules/AddSphinxTarget.cmake

@@ -1,3 +1,16 @@

+

+# Create sphinx target

+if (LLVM_ENABLE_SPHINX AND NOT TARGET sphinx)

+  message(STATUS "Sphinx enabled.")

+  find_package(Sphinx REQUIRED)

+  if (LLVM_BUILD_DOCS)

+    add_custom_target(sphinx ALL)

+  endif()

+else()

+  message(STATUS "Sphinx disabled.")

+endif()

+

+

 # Handy function for creating the different Sphinx targets.

 #

 # ``builder`` should be one of the supported builders used by

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt

index 6dff219..4437610 100644

--- a/docs/CMakeLists.txt

+++ b/docs/CMakeLists.txt

@@ -103,8 +103,8 @@ endif()

 endif()

 if (LLVM_ENABLE_SPHINX)

+  include(AddSphinxTarget)

   if (SPHINX_FOUND)

-    include(AddSphinxTarget)

     if (${SPHINX_OUTPUT_HTML})

       add_sphinx_target(html llvm)

     endif()

-- 

1.8.3.1