This revision was not accepted when it landed; it landed in state "Needs
Review".
This revision was automatically updated to reflect the committed changes.
Closed by commit rLLDB357287: [CMake] Move link dependencies where they are
used. (authored by JDevlieghere, committed by ).
Changed prior to commit:
https://reviews.llvm.org/D59970?vs=192745&id=192865#toc
Repository:
rLLDB LLDB
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59970/new/
https://reviews.llvm.org/D59970
Files:
source/Core/CMakeLists.txt
source/Host/CMakeLists.txt
source/Plugins/ScriptInterpreter/Python/CMakeLists.txt
source/Utility/CMakeLists.txt
Index: source/Core/CMakeLists.txt
===================================================================
--- source/Core/CMakeLists.txt
+++ source/Core/CMakeLists.txt
@@ -1,10 +1,14 @@
set(LLDB_CURSES_LIBS)
+set(LLDB_LIBEDIT_LIBS)
if (NOT LLDB_DISABLE_CURSES)
list(APPEND LLDB_CURSES_LIBS ${CURSES_LIBRARIES})
if(LLVM_ENABLE_TERMINFO AND HAVE_TERMINFO)
list(APPEND LLDB_CURSES_LIBS ${TERMINFO_LIBS})
endif()
+ if (LLVM_BUILD_STATIC)
+ list(APPEND LLDB_CURSES_LIBS gpm)
+ endif()
endif()
add_lldb_library(lldbCore
Index: source/Utility/CMakeLists.txt
===================================================================
--- source/Utility/CMakeLists.txt
+++ source/Utility/CMakeLists.txt
@@ -1,46 +1,15 @@
set(LLDB_SYSTEM_LIBS)
-# Windows-only libraries
-if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
- list(APPEND LLDB_SYSTEM_LIBS
- ws2_32
- rpcrt4
- )
-endif ()
+list(APPEND LLDB_SYSTEM_LIBS ${system_libs})
-if (NOT LLDB_DISABLE_LIBEDIT)
- list(APPEND LLDB_SYSTEM_LIBS ${libedit_LIBRARIES})
-endif()
-if (NOT LLDB_DISABLE_CURSES)
- list(APPEND LLDB_SYSTEM_LIBS ${CURSES_LIBRARIES})
- if(LLVM_ENABLE_TERMINFO AND HAVE_TERMINFO)
- list(APPEND LLDB_SYSTEM_LIBS ${TERMINFO_LIBS})
- endif()
-endif()
+if (CMAKE_SYSTEM_NAME MATCHES "Windows")
+ list(APPEND LLDB_SYSTEM_LIBS ws2_32 rpcrt4)
+endif ()
if (NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB )
list(APPEND LLDB_SYSTEM_LIBS atomic)
endif()
-if(Backtrace_FOUND)
- list(APPEND LLDB_SYSTEM_LIBS ${Backtrace_LIBRARY})
-endif()
-
-if (NOT LLDB_DISABLE_PYTHON AND NOT LLVM_BUILD_STATIC)
- list(APPEND LLDB_SYSTEM_LIBS ${PYTHON_LIBRARY})
-endif()
-
-list(APPEND LLDB_SYSTEM_LIBS ${system_libs})
-
-if (LLVM_BUILD_STATIC)
- if (NOT LLDB_DISABLE_PYTHON)
- list(APPEND LLDB_SYSTEM_LIBS python2.7 util)
- endif()
- if (NOT LLDB_DISABLE_CURSES)
- list(APPEND LLDB_SYSTEM_LIBS gpm)
- endif()
-endif()
-
add_lldb_library(lldbUtility
ArchSpec.cpp
Args.cpp
Index: source/Plugins/ScriptInterpreter/Python/CMakeLists.txt
===================================================================
--- source/Plugins/ScriptInterpreter/Python/CMakeLists.txt
+++ source/Plugins/ScriptInterpreter/Python/CMakeLists.txt
@@ -23,6 +23,8 @@
lldbHost
lldbInterpreter
lldbTarget
+ ${PYTHON_LIBRARY}
+
LINK_COMPONENTS
Support
)
Index: source/Host/CMakeLists.txt
===================================================================
--- source/Host/CMakeLists.txt
+++ source/Host/CMakeLists.txt
@@ -101,7 +101,7 @@
macosx/cfcpp/CFCString.cpp
)
if(IOS)
- set_property(SOURCE macosx/Host.mm APPEND PROPERTY
+ set_property(SOURCE macosx/Host.mm APPEND PROPERTY
COMPILE_DEFINITIONS "NO_XPC_SERVICES=1")
endif()
@@ -158,6 +158,13 @@
list(APPEND EXTRA_LIBS ${libedit_LIBRARIES})
endif()
+if (NOT LLDB_DISABLE_LIBEDIT)
+ list(APPEND LLDB_LIBEDIT_LIBS ${libedit_LIBRARIES})
+ if (LLVM_BUILD_STATIC)
+ list(APPEND LLDB_SYSTEM_LIBS gpm)
+ endif()
+endif()
+
add_lldb_library(lldbHost
${HOST_SOURCES}
@@ -165,6 +172,7 @@
lldbUtility
${EXTRA_LIBS}
${LLDBObjCLibs}
+ ${LLDB_LIBEDIT_LIBS}
LINK_COMPONENTS
Object
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
