[llvm] r302054 - Revert "CMake: Move sphinx detection into AddSphinxTarget.cmake"

[Eric Fiselier via llvm-commits]

Let me know when you re-commit this and I'll update libc++ to handle it.

/Eric

On Wed, May 3, 2017 at 11:22 AM, Tom Stellard via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

> Author: tstellar
> Date: Wed May  3 12:22:23 2017
> New Revision: 302054
>
> URL: http://llvm.org/viewvc/llvm-project?rev=302054&view=rev
> Log:
> 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.
>
> Modified:
>     llvm/trunk/cmake/config-ix.cmake
>     llvm/trunk/cmake/modules/AddSphinxTarget.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=302054&r1=302053&r2=302054&view=diff
> ============================================================
> ==================
> --- llvm/trunk/cmake/config-ix.cmake (original)
> +++ llvm/trunk/cmake/config-ix.cmake Wed May  3 12:22:23 2017
> @@ -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.")
>
> Modified: llvm/trunk/cmake/modules/AddSphinxTarget.cmake
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/
> modules/AddSphinxTarget.cmake?rev=302054&r1=302053&r2=302054&view=diff
> ============================================================
> ==================
> --- llvm/trunk/cmake/modules/AddSphinxTarget.cmake (original)
> +++ llvm/trunk/cmake/modules/AddSphinxTarget.cmake Wed May  3 12:22:23
> 2017
> @@ -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
>
> Modified: llvm/trunk/docs/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/
> CMakeLists.txt?rev=302054&r1=302053&r2=302054&view=diff
> ============================================================
> ==================
> --- llvm/trunk/docs/CMakeLists.txt (original)
> +++ llvm/trunk/docs/CMakeLists.txt Wed May  3 12:22:23 2017
> @@ -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()
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170504/2e447b7a/attachment.html>