diff options
author | Tobias Ribizel <ribizel@kit.edu> | 2022-05-12 15:59:41 -0700 |
---|---|---|
committer | Fangrui Song <i@maskray.me> | 2022-05-12 15:59:41 -0700 |
commit | b1aed14bfea07508e4b9d864168c1ae6b5b5c665 (patch) | |
tree | 83d53e40d9f5fd520f44074aaafa692f402c9e3d | |
parent | 6f3c7dfb7746b04cc98c2f29395dec5027e8d7f3 (diff) | |
download | llvm-b1aed14bfea07508e4b9d864168c1ae6b5b5c665.tar.gz |
[llvm][lldb] use FindLibEdit.cmake everywhere
Currently, LLVM's LineEditor and LLDB both use libedit, but find them in different (inconsistent) ways.
This causes issues e.g. when you are using a locally installed version of libedit, which will not be used
by clang-query, but by lldb if picked up by FindLibEdit.cmake
Reviewed By: MaskRay
Differential Revision: https://reviews.llvm.org/D124673
-rw-r--r-- | cmake/Modules/FindLibEdit.cmake (renamed from lldb/cmake/modules/FindLibEdit.cmake) | 6 | ||||
-rw-r--r-- | lldb/cmake/modules/LLDBStandalone.cmake | 10 | ||||
-rw-r--r-- | lldb/source/Core/CMakeLists.txt | 4 | ||||
-rw-r--r-- | lldb/source/Host/CMakeLists.txt | 7 | ||||
-rw-r--r-- | lldb/source/Interpreter/CMakeLists.txt | 3 | ||||
-rw-r--r-- | lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt | 8 | ||||
-rw-r--r-- | llvm/cmake/config-ix.cmake | 6 | ||||
-rw-r--r-- | llvm/lib/LineEditor/CMakeLists.txt | 2 | ||||
-rw-r--r-- | llvm/utils/gn/secondary/lldb/source/Host/BUILD.gn | 2 |
9 files changed, 24 insertions, 24 deletions
diff --git a/lldb/cmake/modules/FindLibEdit.cmake b/cmake/Modules/FindLibEdit.cmake index 8b00d34de001..94c6150cefda 100644 --- a/lldb/cmake/modules/FindLibEdit.cmake +++ b/cmake/Modules/FindLibEdit.cmake @@ -62,3 +62,9 @@ else() mark_as_advanced(LibEdit_INCLUDE_DIRS LibEdit_LIBRARIES) endif() +if (LibEdit_FOUND AND NOT TARGET LibEdit::LibEdit) + add_library(LibEdit::LibEdit UNKNOWN IMPORTED) + set_target_properties(LibEdit::LibEdit PROPERTIES + IMPORTED_LOCATION ${LibEdit_LIBRARIES} + INTERFACE_INCLUDE_DIRECTORIES ${LibEdit_INCLUDE_DIRS}) +endif() diff --git a/lldb/cmake/modules/LLDBStandalone.cmake b/lldb/cmake/modules/LLDBStandalone.cmake index 1d3d1bbcc25d..d2f07576bf21 100644 --- a/lldb/cmake/modules/LLDBStandalone.cmake +++ b/lldb/cmake/modules/LLDBStandalone.cmake @@ -4,6 +4,12 @@ if(POLICY CMP0116) cmake_policy(SET CMP0116 OLD) endif() +if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) + set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) +endif() + +list(APPEND CMAKE_MODULE_PATH "${LLVM_COMMON_CMAKE_UTILS}/Modules") + option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF) find_package(LLVM REQUIRED CONFIG HINTS ${LLVM_DIR} NO_CMAKE_FIND_ROOT_PATH) @@ -105,6 +111,10 @@ include_directories( "${LLVM_INCLUDE_DIRS}" "${CLANG_INCLUDE_DIRS}") +if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) + set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) +endif() + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}) diff --git a/lldb/source/Core/CMakeLists.txt b/lldb/source/Core/CMakeLists.txt index 0efaab53f313..d907177586e7 100644 --- a/lldb/source/Core/CMakeLists.txt +++ b/lldb/source/Core/CMakeLists.txt @@ -103,10 +103,6 @@ add_dependencies(lldbCore # TODO: Remove once we have better layering set_target_properties(lldbCore PROPERTIES LINK_INTERFACE_MULTIPLICITY 5) -if (LLDB_ENABLE_LIBEDIT) - target_include_directories(lldbCore PRIVATE ${LibEdit_INCLUDE_DIRS}) -endif() - if (LLDB_ENABLE_CURSES) target_include_directories(lldbCore PRIVATE ${CURSES_INCLUDE_DIRS}) endif() diff --git a/lldb/source/Host/CMakeLists.txt b/lldb/source/Host/CMakeLists.txt index 70942e0772aa..64d9bb00ffab 100644 --- a/lldb/source/Host/CMakeLists.txt +++ b/lldb/source/Host/CMakeLists.txt @@ -141,7 +141,7 @@ if (HAVE_LIBDL) list(APPEND EXTRA_LIBS ${CMAKE_DL_LIBS}) endif() if (LLDB_ENABLE_LIBEDIT) - list(APPEND EXTRA_LIBS ${LibEdit_LIBRARIES}) + list(APPEND EXTRA_LIBS LibEdit::LibEdit) endif() if (LLDB_ENABLE_LZMA) list(APPEND EXTRA_LIBS ${LIBLZMA_LIBRARIES}) @@ -151,7 +151,7 @@ if (WIN32) endif() if (LLDB_ENABLE_LIBEDIT) - list(APPEND LLDB_LIBEDIT_LIBS ${LibEdit_LIBRARIES}) + list(APPEND LLDB_LIBEDIT_LIBS LibEdit::LibEdit) if (LLVM_BUILD_STATIC) list(APPEND LLDB_SYSTEM_LIBS gpm) endif() @@ -171,6 +171,3 @@ add_lldb_library(lldbHost Support ) -if (LLDB_ENABLE_LIBEDIT) - target_include_directories(lldbHost PUBLIC ${LibEdit_INCLUDE_DIRS}) -endif() diff --git a/lldb/source/Interpreter/CMakeLists.txt b/lldb/source/Interpreter/CMakeLists.txt index af9b0ce86f34..d22e94a4ee4d 100644 --- a/lldb/source/Interpreter/CMakeLists.txt +++ b/lldb/source/Interpreter/CMakeLists.txt @@ -68,6 +68,3 @@ add_dependencies(lldbInterpreter LLDBInterpreterPropertiesGen LLDBInterpreterPropertiesEnumGen) -if (LLDB_ENABLE_LIBEDIT) - target_include_directories(lldbInterpreter PRIVATE ${LibEdit_INCLUDE_DIRS}) -endif() diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt b/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt index 1dd6282876f4..ed62a692a2fb 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt +++ b/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt @@ -10,7 +10,7 @@ add_definitions(-DLLDB_PYTHON_EXE_RELATIVE_PATH="${LLDB_PYTHON_EXE_RELATIVE_PATH if (LLDB_ENABLE_LIBEDIT) - list(APPEND LLDB_LIBEDIT_LIBS ${LibEdit_LIBRARIES}) + list(APPEND LLDB_LIBEDIT_LIBS LibEdit::LibEdit) endif() add_lldb_library(lldbPluginScriptInterpreterPython PLUGIN @@ -35,9 +35,3 @@ add_lldb_library(lldbPluginScriptInterpreterPython PLUGIN LINK_COMPONENTS Support ) - -if (LLDB_ENABLE_LIBEDIT) - target_include_directories(lldbPluginScriptInterpreterPython PUBLIC - ${LibEdit_INCLUDE_DIRS} - ) -endif() diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index df7c43b701c3..0da93ec99069 100644 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake @@ -64,7 +64,6 @@ check_symbol_exists(FE_ALL_EXCEPT "fenv.h" HAVE_DECL_FE_ALL_EXCEPT) check_symbol_exists(FE_INEXACT "fenv.h" HAVE_DECL_FE_INEXACT) check_include_file(mach/mach.h HAVE_MACH_MACH_H) -check_include_file(histedit.h HAVE_HISTEDIT_H) check_include_file(CrashReporterClient.h HAVE_CRASHREPORTERCLIENT_H) if(APPLE) include(CheckCSourceCompiles) @@ -184,8 +183,9 @@ if(NOT LLVM_USE_SANITIZER MATCHES "Memory.*") # Don't look for these libraries on Windows. if (NOT PURE_WINDOWS) # Skip libedit if using ASan as it contains memory leaks. - if (LLVM_ENABLE_LIBEDIT AND HAVE_HISTEDIT_H AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*") - check_library_exists(edit el_init "" HAVE_LIBEDIT) + if (LLVM_ENABLE_LIBEDIT AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*") + find_package(LibEdit) + set(HAVE_LIBEDIT ${LibEdit_FOUND}) else() set(HAVE_LIBEDIT 0) endif() diff --git a/llvm/lib/LineEditor/CMakeLists.txt b/llvm/lib/LineEditor/CMakeLists.txt index 61328f76905a..c4cd91cbb0cd 100644 --- a/llvm/lib/LineEditor/CMakeLists.txt +++ b/llvm/lib/LineEditor/CMakeLists.txt @@ -1,5 +1,5 @@ if(HAVE_LIBEDIT) - set(link_libs edit) + set(link_libs LibEdit::LibEdit) endif() add_llvm_component_library(LLVMLineEditor diff --git a/llvm/utils/gn/secondary/lldb/source/Host/BUILD.gn b/llvm/utils/gn/secondary/lldb/source/Host/BUILD.gn index 97a53cb9a031..cd6511a98b6d 100644 --- a/llvm/utils/gn/secondary/lldb/source/Host/BUILD.gn +++ b/llvm/utils/gn/secondary/lldb/source/Host/BUILD.gn @@ -142,7 +142,7 @@ static_library("Host") { # list(APPEND EXTRA_LIBS ${CMAKE_DL_LIBS}) # endif() # if (LLDB_ENABLE_LIBEDIT) - # list(APPEND EXTRA_LIBS ${LibEdit_LIBRARIES}) + # list(APPEND EXTRA_LIBS LibEdit::LibEdit) # endif() # if (LLDB_ENABLE_LZMA) # list(APPEND EXTRA_LIBS ${LIBLZMA_LIBRARIES}) |