Revert "CMake: Move sphinx detection into AddSphinxTarget.cmake"

This reverts commit r302025.

clang and lld need to be updated too so they don't break with this patch.

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

diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index de8e9bf9a494404a2cdb63ba8327e329cb983076..0331d0fa10abf161af11ffdfbf401681febcf6d8 100755 (executable)
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -530,6 +530,16 @@ 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 c3a676d3063da147ad5aae8b5cdc61010370a64e..cfc7f38e9e7776e81f79993b713584de935fbb1a 100644 (file)
--- a/cmake/modules/AddSphinxTarget.cmake
+++ b/cmake/modules/AddSphinxTarget.cmake
@@ -1,16 +1,3 @@
-
-# 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 4437610146c45a04316f2f1a1fab6fca5d1d984a..6dff219ae37ffafa2b689b1008297c704d94e8c4 100644 (file)
--- 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()