Merge branch 'main' into root-span-sample

open-telemetry · May 23, 2021 · 515be01 · 515be01
2 parents f1a4ed5 + 5a1b189
commit 515be01
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,3 @@
+# OpenTelemetry Community Code of Conduct
+
+OpenTelemetry follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
diff --git a/ext/src/http/client/curl/CMakeLists.txt b/ext/src/http/client/curl/CMakeLists.txt
@@ -5,7 +5,12 @@ if(CURL_FOUND)
   set_target_properties(http_client_curl PROPERTIES EXPORT_NAME
                                                     http_client_curl)
 
-  target_link_libraries(http_client_curl PUBLIC CURL::libcurl)
+  if(TARGET CURL::libcurl)
+    target_link_libraries(http_client_curl PUBLIC CURL::libcurl)
+  else()
+    include_directories(${CURL_INCLUDE_DIRS})
+    target_link_libraries(http_client_curl PUBLIC ${CURL_LIBRARIES})
+  endif()
 
   install(
     TARGETS http_client_curl
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# OpenTelemetry Community Code of Conduct

		OpenTelemetry follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).