rebase of the patch

This commit is contained in:
Sylvestre Ledru 2018-07-18 13:00:17 +02:00
parent 6f328272ca
commit ef36403cd9

View File

@ -2,11 +2,11 @@
lldb/source/API/CMakeLists.txt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
Index: llvm-toolchain-snapshot_5.0~svn294583/lldb/source/API/CMakeLists.txt
Index: llvm-toolchain-snapshot_7~svn337372/lldb/source/API/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_5.0~svn294583.orig/lldb/source/API/CMakeLists.txt
+++ llvm-toolchain-snapshot_5.0~svn294583/lldb/source/API/CMakeLists.txt
@@ -18,7 +18,12 @@ endif()
--- llvm-toolchain-snapshot_7~svn337372.orig/lldb/source/API/CMakeLists.txt
+++ llvm-toolchain-snapshot_7~svn337372/lldb/source/API/CMakeLists.txt
@@ -4,7 +4,12 @@ endif()
get_property(LLDB_ALL_PLUGINS GLOBAL PROPERTY LLDB_PLUGINS)
@ -20,16 +20,16 @@ Index: llvm-toolchain-snapshot_5.0~svn294583/lldb/source/API/CMakeLists.txt
SBAddress.cpp
SBAttachInfo.cpp
SBBlock.cpp
@@ -116,7 +121,7 @@ target_link_libraries(liblldb PRIVATE
@@ -112,7 +117,7 @@ endif ()
set_target_properties(liblldb
PROPERTIES
- VERSION ${LLDB_VERSION}
+ VERSION 1
)
)
if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
@@ -140,11 +145,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows"
@@ -136,11 +141,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows"
if (MSVC AND NOT LLDB_DISABLE_PYTHON)
target_link_libraries(liblldb PRIVATE ${PYTHON_LIBRARY})
endif()
@ -37,7 +37,7 @@ Index: llvm-toolchain-snapshot_5.0~svn294583/lldb/source/API/CMakeLists.txt
- set_target_properties(liblldb
- PROPERTIES
- OUTPUT_NAME lldb
- )
- )
endif()
if (LLDB_WRAP_PYTHON)