Author: Jonas Devlieghere Date: 2021-04-29T22:09:10-07:00 New Revision: b535459d0a1db37fca6688b8e15305e361debff5
URL: https://github.com/llvm/llvm-project/commit/b535459d0a1db37fca6688b8e15305e361debff5 DIFF: https://github.com/llvm/llvm-project/commit/b535459d0a1db37fca6688b8e15305e361debff5.diff LOG: [debugserver] Use add_lldb_library instead of add_library Use add_lldb_library to ensure debugserver inherits the defines set by llvm and lldb. Differential revision: https://reviews.llvm.org/D101596 Added: Modified: lldb/tools/debugserver/source/CMakeLists.txt Removed: ################################################################################ diff --git a/lldb/tools/debugserver/source/CMakeLists.txt b/lldb/tools/debugserver/source/CMakeLists.txt index b2bf01d7774d8..ab7e393aab9a9 100644 --- a/lldb/tools/debugserver/source/CMakeLists.txt +++ b/lldb/tools/debugserver/source/CMakeLists.txt @@ -236,7 +236,12 @@ set(lldbDebugserverCommonSources ${generated_mach_interfaces} ${DEBUGSERVER_VERS_GENERATED_FILE}) -add_library(lldbDebugserverCommon ${lldbDebugserverCommonSources}) +# Tell LLVM not to complain about these source files. +set(LLVM_OPTIONAL_SOURCES + ${lldbDebugserverCommonSources} + debugserver.cpp) + +add_lldb_library(lldbDebugserverCommon ${lldbDebugserverCommonSources}) set_target_properties(lldbDebugserverCommon PROPERTIES FOLDER "lldb libraries/debugserver") target_link_libraries(lldbDebugserverCommon @@ -259,7 +264,6 @@ if(HAVE_LIBCOMPRESSION) set_property(TARGET lldbDebugserverCommon APPEND PROPERTY COMPILE_DEFINITIONS HAVE_LIBCOMPRESSION) endif() -set(LLVM_OPTIONAL_SOURCES ${lldbDebugserverCommonSources}) add_lldb_tool(debugserver ADD_TO_FRAMEWORK debugserver.cpp LINK_LIBS lldbDebugserverCommon @@ -315,7 +319,7 @@ if(APPLE_EMBEDDED) -F${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks ) - add_library(lldbDebugserverCommon_NonUI ${lldbDebugserverCommonSources}) + add_lldb_library(lldbDebugserverCommon_NonUI ${lldbDebugserverCommonSources}) target_link_libraries(lldbDebugserverCommon_NonUI INTERFACE ${COCOA_LIBRARY} ${CORE_FOUNDATION_LIBRARY} _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits