<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><br class=""><div><blockquote type="cite" class=""><div class="">On May 12, 2017, at 12:22 PM, Tom Stellard <<a href="mailto:tstellar@redhat.com" class="">tstellar@redhat.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">On 05/12/2017 02:49 PM, Adam Nemet wrote:</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;" class=""><br class=""><blockquote type="cite" class="">On May 12, 2017, at 11:44 AM, Tom Stellard <<a href="mailto:tstellar@redhat.com" class="">tstellar@redhat.com</a>> wrote:<br class=""><br class="">On 05/12/2017 02:31 PM, Adam Nemet wrote:<br class=""><blockquote type="cite" class="">Hi Tom,<br class=""><br class=""><blockquote type="cite" class="">On May 8, 2017, at 6:41 PM, Tom Stellard via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a>> wrote:<br class=""><br class="">Author: tstellar<br class="">Date: Mon May 8 20:41:28 2017<br class="">New Revision: 302499<br class=""><br class="">URL: <a href="http://llvm.org/viewvc/llvm-project?rev=302499&view=rev" class="">http://llvm.org/viewvc/llvm-project?rev=302499&view=rev</a><br class="">Log:<br class="">Revert "Revert "CMake: Move sphinx detection into AddSphinxTarget.cmake""<br class=""><br class="">This reverts commit r302054.<br class=""><br class="">Re-commit now that I have fixes for clang/lld.<br class=""><br class="">Modified:<br class=""> llvm/trunk/cmake/config-ix.cmake<br class=""> llvm/trunk/cmake/modules/AddSphinxTarget.cmake<br class=""> llvm/trunk/docs/CMakeLists.txt<br class=""><br class="">Modified: llvm/trunk/cmake/config-ix.cmake<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=302499&r1=302498&r2=302499&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=302499&r1=302498&r2=302499&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/cmake/config-ix.cmake (original)<br class="">+++ llvm/trunk/cmake/config-ix.cmake Mon May 8 20:41:28 2017<br class="">@@ -530,16 +530,6 @@ else()<br class="">message(STATUS "Doxygen disabled.")<br class="">endif()<br class=""><br class="">-if (LLVM_ENABLE_SPHINX)<br class="">- message(STATUS "Sphinx enabled.")<br class="">- find_package(Sphinx REQUIRED)<br class="">- if (LLVM_BUILD_DOCS)<br class="">- add_custom_target(sphinx ALL)<br class="">- endif()<br class="">-else()<br class="">- message(STATUS "Sphinx disabled.")<br class="">-endif()<br class="">-<br class="">set(LLVM_BINDINGS "")<br class="">if(WIN32)<br class="">message(STATUS "Go bindings disabled.")<br class=""><br class="">Modified: llvm/trunk/cmake/modules/AddSphinxTarget.cmake<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddSphinxTarget.cmake?rev=302499&r1=302498&r2=302499&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddSphinxTarget.cmake?rev=302499&r1=302498&r2=302499&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/cmake/modules/AddSphinxTarget.cmake (original)<br class="">+++ llvm/trunk/cmake/modules/AddSphinxTarget.cmake Mon May 8 20:41:28 2017<br class="">@@ -1,3 +1,16 @@<br class="">+<br class="">+# Create sphinx target<br class="">+if (LLVM_ENABLE_SPHINX AND NOT TARGET sphinx)<br class="">+ message(STATUS "Sphinx enabled.")<br class="">+ find_package(Sphinx REQUIRED)<br class="">+ if (LLVM_BUILD_DOCS)<br class="">+ add_custom_target(sphinx ALL)<br class="">+ endif()<br class="">+else()<br class="">+ message(STATUS "Sphinx disabled.")<br class="">+endif()<br class=""></blockquote><br class="">Looks like this broke the docs-llvm-man target when configuring the llvm and clang trees together.<br class=""><br class="">You should be able to reproduce with SPHINX_OUTPUT_MAN=On.<br class=""><br class="">I am not a cmake expert, but looks like that SPHINX_FOUND has a local scope when AddSphinxTarget is included from tools/clang/docs. Then we get to llvm at which point the sphinx target is already there so we won’t go looking for sphinx and thus SPHINX_FOUND won’t be set.<br class=""><br class="">Please revert or investigate.<br class=""><br class=""></blockquote><br class="">I can't reproduce this on my machine, can you send me all<br class="">the options you passed to cmake?<br class=""></blockquote><br class="">Here you go:<br class=""><br class="">cmake .. -G Ninja -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" -DLLVM_BUILD_DOCS=On -DLLVM_ENABLE_SPHINX=On -DSPHINX_WARNINGS_AS_ERRORS=Off -DSPHINX_OUTPUT_HTML=On -DSPHINX_OUTPUT_MAN=On<br class=""><br class=""><blockquote type="cite" class="">Also, did you try removing<br class="">your CMakeCache.txt and rebuilding?<br class=""></blockquote><br class="">Yes, this was with a clean build dir.<br class=""><br class=""><blockquote type="cite" class="">Does your clang checkout have<br class="">r302500?<br class=""></blockquote><br class="">Yes.<br class=""><br class="">Adam<br class=""><br class=""></blockquote><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">Should be fixed by:<span class="Apple-converted-space"> </span></span><a href="https://reviews.llvm.org/D33146" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;" class="">https://reviews.llvm.org/D33146</a><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">Can you test it?</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""></div></blockquote><div><br class=""></div><div>It was found by one our internal bots. Let’s just commit it and then you’ll hear from me if the bot is still broken.</div><div><br class=""></div><div>Thanks for the quick fix!</div><div><br class=""></div><div>Adam</div><br class=""><blockquote type="cite" class=""><div class=""><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">-Tom</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;" class=""><blockquote type="cite" class=""><br class=""><br class="">-Tom<br class=""><br class=""><br class=""><blockquote type="cite" class="">Thanks,<br class="">Adam<br class=""><br class=""><br class=""><blockquote type="cite" class="">+<br class="">+<br class=""># Handy function for creating the different Sphinx targets.<br class="">#<br class=""># ``builder`` should be one of the supported builders used by<br class=""><br class="">Modified: llvm/trunk/docs/CMakeLists.txt<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CMakeLists.txt?rev=302499&r1=302498&r2=302499&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CMakeLists.txt?rev=302499&r1=302498&r2=302499&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/docs/CMakeLists.txt (original)<br class="">+++ llvm/trunk/docs/CMakeLists.txt Mon May 8 20:41:28 2017<br class="">@@ -103,8 +103,8 @@ endif()<br class="">endif()<br class=""><br class="">if (LLVM_ENABLE_SPHINX)<br class="">+ include(AddSphinxTarget)<br class="">if (SPHINX_FOUND)<br class="">- include(AddSphinxTarget)<br class=""> if (${SPHINX_OUTPUT_HTML})<br class=""> add_sphinx_target(html llvm)<br class=""> endif()<br class=""><br class=""><br class="">_______________________________________________<br class="">llvm-commits mailing list<br class=""><a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a><br class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</blockquote></blockquote></blockquote></blockquote></div></blockquote></div><br class=""></body></html>