From f837972e49f12ba9d46b53b6cdce205ada91bfa4 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 27 May 2023 10:49:09 +1100 Subject: [PATCH] try the fallback --- ...4-ensure-we-correctly-link-to-protobuf.patch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/recipe/patches/0004-ensure-we-correctly-link-to-protobuf.patch b/recipe/patches/0004-ensure-we-correctly-link-to-protobuf.patch index 12f9386..d59f103 100644 --- a/recipe/patches/0004-ensure-we-correctly-link-to-protobuf.patch +++ b/recipe/patches/0004-ensure-we-correctly-link-to-protobuf.patch @@ -1,23 +1,24 @@ -From bd1260daa9344b35cf719db3ca412198a57171cf Mon Sep 17 00:00:00 2001 +From 94174b0cc5e4f7f5cec3797a76e61266e7a05e62 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 27 May 2023 10:34:28 +1100 Subject: [PATCH 4/4] ensure we correctly link to protobuf --- - cmake/opentelemetry-proto.cmake | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + cmake/opentelemetry-proto.cmake | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake -index e869cb11..50a8101a 100644 +index e869cb11..a867a2c9 100644 --- a/cmake/opentelemetry-proto.cmake +++ b/cmake/opentelemetry-proto.cmake -@@ -291,7 +291,8 @@ if(OPENTELEMETRY_INSTALL) +@@ -291,9 +291,7 @@ if(OPENTELEMETRY_INSTALL) PATTERN "*.h") endif() -if(TARGET protobuf::libprotobuf) -+find_package(Protobuf REQUIRED) +- target_link_libraries(opentelemetry_proto PUBLIC protobuf::libprotobuf) +-else() # cmake 3.8 or lower +if(TRUE) - target_link_libraries(opentelemetry_proto PUBLIC protobuf::libprotobuf) - else() # cmake 3.8 or lower target_include_directories(opentelemetry_proto + PUBLIC ${Protobuf_INCLUDE_DIRS}) + target_link_libraries(opentelemetry_proto PUBLIC ${Protobuf_LIBRARIES})