<div dir="ltr">Looks fine to me.</div><br><div class="gmail_quote"><div dir="ltr">On Mon, Jul 20, 2015 at 9:56 AM Hans Wennborg <<a href="mailto:hans@chromium.org">hans@chromium.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">+lldb-commits; please keep merge requests on the mailing list<br>
<br>
Zach, you're listed as the code owner for the cmake build. OK to merge<br>
this to 3.7?<br>
<br>
Thanks,<br>
Hans<br>
<br>
On Mon, Jul 20, 2015 at 7:26 AM, Pavel Labath <<a href="mailto:labath@google.com" target="_blank">labath@google.com</a>> wrote:<br>
> Hi,<br>
><br>
> would it be possible to merge this commit into the 3.7 branch?<br>
<br>
><br>
><br>
> ---------- Forwarded message ----------<br>
> From: Pavel Labath <<a href="mailto:labath@google.com" target="_blank">labath@google.com</a>><br>
> Date: 17 July 2015 at 16:50<br>
> Subject: [Lldb-commits] [lldb] r242529 - Standalone cmake build<br>
> improvements (bug #23889)<br>
> To: <a href="mailto:lldb-commits@cs.uiuc.edu" target="_blank">lldb-commits@cs.uiuc.edu</a><br>
><br>
><br>
> Author: labath<br>
> Date: Fri Jul 17 10:50:48 2015<br>
> New Revision: 242529<br>
><br>
> URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D242529-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=MEqT8U_n7oNfuDW5NRbY3ZV384ZquXIYFPWmprwUdKM&m=lAznYxra_yrDTVHwJsrouEKqX0UjcAgpMpjLghmU_GA&s=9UC7I4ICwoyOsgwnxyknTwNyJZ3hwbND9it232AzH7Q&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=242529&view=rev</a><br>
> Log:<br>
> Standalone cmake build improvements (bug #23889)<br>
><br>
> patch by Eugene Zelenko.<br>
><br>
> Modified:<br>
>     lldb/trunk/CMakeLists.txt<br>
>     lldb/trunk/cmake/modules/LLDBStandalone.cmake<br>
><br>
> Modified: lldb/trunk/CMakeLists.txt<br>
> URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_lldb_trunk_CMakeLists.txt-3Frev-3D242529-26r1-3D242528-26r2-3D242529-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=MEqT8U_n7oNfuDW5NRbY3ZV384ZquXIYFPWmprwUdKM&m=lAznYxra_yrDTVHwJsrouEKqX0UjcAgpMpjLghmU_GA&s=Wo8lZWpu9XrA0nqDyyIqQIs-TtDh9ju6eW8q5-IZLVY&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/CMakeLists.txt?rev=242529&r1=242528&r2=242529&view=diff</a><br>
> ==============================================================================<br>
> --- lldb/trunk/CMakeLists.txt (original)<br>
> +++ lldb/trunk/CMakeLists.txt Fri Jul 17 10:50:48 2015<br>
> @@ -1,5 +1,7 @@<br>
> -include(cmake/modules/LLDBConfig.cmake)<br>
> +cmake_minimum_required(VERSION 2.8)<br>
> +<br>
>  include(cmake/modules/LLDBStandalone.cmake)<br>
> +include(cmake/modules/LLDBConfig.cmake)<br>
>  include(cmake/modules/AddLLDB.cmake)<br>
><br>
>  #add_subdirectory(include)<br>
> @@ -13,7 +15,6 @@ add_subdirectory(tools)<br>
>  add_subdirectory(unittests)<br>
>  add_subdirectory(lit)<br>
><br>
> -<br>
>  if ( LLDB_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION AND NOT<br>
> LLDB_DISABLE_PYTHON )<br>
>         # Add a Post-Build Event to copy over Python files and create<br>
> the symlink to liblldb.so for the Python API(hardlink on Windows)<br>
>      add_custom_target( finish_swig ALL<br>
><br>
> Modified: lldb/trunk/cmake/modules/LLDBStandalone.cmake<br>
> URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_lldb_trunk_cmake_modules_LLDBStandalone.cmake-3Frev-3D242529-26r1-3D242528-26r2-3D242529-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=MEqT8U_n7oNfuDW5NRbY3ZV384ZquXIYFPWmprwUdKM&m=lAznYxra_yrDTVHwJsrouEKqX0UjcAgpMpjLghmU_GA&s=VkP7eyjSYzFcxIysbk6f_7oBHJDVijxzSbjKKopH9n0&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/LLDBStandalone.cmake?rev=242529&r1=242528&r2=242529&view=diff</a><br>
> ==============================================================================<br>
> --- lldb/trunk/cmake/modules/LLDBStandalone.cmake (original)<br>
> +++ lldb/trunk/cmake/modules/LLDBStandalone.cmake Fri Jul 17 10:50:48 2015<br>
> @@ -43,6 +43,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR<br>
>    # These variables are used by add_llvm_library.<br>
>    set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)<br>
>    set(LLVM_LIBRARY_OUTPUT_INTDIR<br>
> ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})<br>
> +  set(LLVM_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})<br>
><br>
>    include(AddLLVM)<br>
>    include(HandleLLVMOptions)<br>
><br>
><br>
> _______________________________________________<br>
> lldb-commits mailing list<br>
> <a href="mailto:lldb-commits@cs.uiuc.edu" target="_blank">lldb-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits" rel="noreferrer" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits</a><br>
</blockquote></div>