RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 18:54:02 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
This reverts commit r302054.

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

llvm-svn: 302499
This commit is contained in:
Tom Stellard 2017-05-09 01:41:28 +00:00
parent 945ac266a3
commit 59a98b05ce
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/config-ix.cmake
View File

@ -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.")

13
cmake/modules/AddSphinxTarget.cmake
View File

@ -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

2
docs/CMakeLists.txt
View File

@ -103,8 +103,8 @@ endif()
endif()
if (LLVM_ENABLE_SPHINX)
if (SPHINX_FOUND)
include(AddSphinxTarget)
if (SPHINX_FOUND)
if (${SPHINX_OUTPUT_HTML})
add_sphinx_target(html llvm)
endif()