[Lldb-commits] [lldb] r242529 - Standalone cmake build improvements (bug #23889)

[Hans Wennborg]

+lldb-commits; please keep merge requests on the mailing list

Zach, you're listed as the code owner for the cmake build. OK to merge
this to 3.7?

Thanks,
Hans

On Mon, Jul 20, 2015 at 7:26 AM, Pavel Labath <labath at google.com> wrote:
> Hi,
>
> would it be possible to merge this commit into the 3.7 branch?

>
>
> ---------- Forwarded message ----------
> From: Pavel Labath <labath at google.com>
> Date: 17 July 2015 at 16:50
> Subject: [Lldb-commits] [lldb] r242529 - Standalone cmake build
> improvements (bug #23889)
> To: lldb-commits at cs.uiuc.edu
>
>
> Author: labath
> Date: Fri Jul 17 10:50:48 2015
> New Revision: 242529
>
> URL: http://llvm.org/viewvc/llvm-project?rev=242529&view=rev
> Log:
> Standalone cmake build improvements (bug #23889)
>
> patch by Eugene Zelenko.
>
> Modified:
>     lldb/trunk/CMakeLists.txt
>     lldb/trunk/cmake/modules/LLDBStandalone.cmake
>
> Modified: lldb/trunk/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/CMakeLists.txt?rev=242529&r1=242528&r2=242529&view=diff
> ==============================================================================
> --- lldb/trunk/CMakeLists.txt (original)
> +++ lldb/trunk/CMakeLists.txt Fri Jul 17 10:50:48 2015
> @@ -1,5 +1,7 @@
> -include(cmake/modules/LLDBConfig.cmake)
> +cmake_minimum_required(VERSION 2.8)
> +
>  include(cmake/modules/LLDBStandalone.cmake)
> +include(cmake/modules/LLDBConfig.cmake)
>  include(cmake/modules/AddLLDB.cmake)
>
>  #add_subdirectory(include)
> @@ -13,7 +15,6 @@ add_subdirectory(tools)
>  add_subdirectory(unittests)
>  add_subdirectory(lit)
>
> -
>  if ( LLDB_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION AND NOT
> LLDB_DISABLE_PYTHON )
>         # Add a Post-Build Event to copy over Python files and create
> the symlink to liblldb.so for the Python API(hardlink on Windows)
>      add_custom_target( finish_swig ALL
>
> Modified: lldb/trunk/cmake/modules/LLDBStandalone.cmake
> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/LLDBStandalone.cmake?rev=242529&r1=242528&r2=242529&view=diff
> ==============================================================================
> --- lldb/trunk/cmake/modules/LLDBStandalone.cmake (original)
> +++ lldb/trunk/cmake/modules/LLDBStandalone.cmake Fri Jul 17 10:50:48 2015
> @@ -43,6 +43,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
>    # These variables are used by add_llvm_library.
>    set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
>    set(LLVM_LIBRARY_OUTPUT_INTDIR
> ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
> +  set(LLVM_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
>
>    include(AddLLVM)
>    include(HandleLLVMOptions)
>
>
> _______________________________________________
> lldb-commits mailing list
> lldb-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits