[PATCH] D115189: [Support] [Debuginfod] Use libcurl imported library.
Noah Shutty via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Wed Dec 8 17:49:44 PST 2021
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG54b35c09b2cd: [Support] [Debuginfod] Use libcurl imported library. (authored by noajshu).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D115189/new/
https://reviews.llvm.org/D115189
Files:
llvm/lib/Debuginfod/CMakeLists.txt
Index: llvm/lib/Debuginfod/CMakeLists.txt
===================================================================
--- llvm/lib/Debuginfod/CMakeLists.txt
+++ llvm/lib/Debuginfod/CMakeLists.txt
@@ -1,6 +1,6 @@
# Link LibCURL if the user wants it
if (LLVM_ENABLE_CURL)
- set(imported_libs ${CURL_LIBRARIES})
+ set(imported_libs CURL::libcurl)
endif()
add_llvm_component_library(LLVMDebuginfod
@@ -17,4 +17,17 @@
Support
)
-set(llvm_system_libs ${system_libs})
+# This block is only needed for llvm-config. When we deprecate llvm-config and
+# move to using CMake export, this block can be removed.
+if(LLVM_ENABLE_CURL)
+ # CMAKE_BUILD_TYPE is only meaningful to single-configuration generators.
+ if(CMAKE_BUILD_TYPE)
+ string(TOUPPER ${CMAKE_BUILD_TYPE} build_type)
+ get_property(curl_library TARGET CURL::libcurl PROPERTY LOCATION_${build_type})
+ endif()
+ if(NOT curl_library)
+ get_property(curl_library TARGET CURL::libcurl PROPERTY LOCATION)
+ endif()
+ get_library_name(${curl_library} curl_library)
+ set(llvm_system_libs ${llvm_system_libs} "${curl_library}")
+endif()
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D115189.393002.patch
Type: text/x-patch
Size: 1106 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20211209/1564afb8/attachment.bin>
More information about the llvm-commits
mailing list