[llvm-branch-commits] [lldb] r242691 - Merging r242529:

[Hans Wennborg]

Author: hans
Date: Mon Jul 20 13:00:00 2015
New Revision: 242691

URL: http://llvm.org/viewvc/llvm-project?rev=242691&view=rev
Log:
Merging r242529:
------------------------------------------------------------------------
r242529 | labath | 2015-07-17 08:50:48 -0700 (Fri, 17 Jul 2015) | 3 lines

Standalone cmake build improvements (bug #23889)

patch by Eugene Zelenko.
------------------------------------------------------------------------

Modified:
    lldb/branches/release_37/   (props changed)
    lldb/branches/release_37/CMakeLists.txt
    lldb/branches/release_37/cmake/modules/LLDBStandalone.cmake

Propchange: lldb/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 20 13:00:00 2015
@@ -1,3 +1,3 @@
 /lldb/branches/apple/python-GIL:156467-162159
 /lldb/branches/iohandler:198360-200250
-/lldb/trunk:242306,242381,242525
+/lldb/trunk:242306,242381,242525,242529

Modified: lldb/branches/release_37/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_37/CMakeLists.txt?rev=242691&r1=242690&r2=242691&view=diff
==============================================================================
--- lldb/branches/release_37/CMakeLists.txt (original)
+++ lldb/branches/release_37/CMakeLists.txt Mon Jul 20 13:00:00 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/branches/release_37/cmake/modules/LLDBStandalone.cmake
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_37/cmake/modules/LLDBStandalone.cmake?rev=242691&r1=242690&r2=242691&view=diff
==============================================================================
--- lldb/branches/release_37/cmake/modules/LLDBStandalone.cmake (original)
+++ lldb/branches/release_37/cmake/modules/LLDBStandalone.cmake Mon Jul 20 13:00:00 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)