File tree 4 files changed +39
-6
lines changed
recipes/opentelemetry-cpp 4 files changed +39
-6
lines changed Original file line number Diff line number Diff line change 1
1
sources :
2
+ " 1.8.2 " :
3
+ url : " https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.2.tar.gz"
4
+ sha256 : " 20fa97e507d067e9e2ab0c1accfc334f5a4b10d01312e55455dc3733748585f4"
2
5
" 1.8.1 " :
3
6
url : " https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.1.tar.gz"
4
7
sha256 : " 3d640201594b07f08dade9cd1017bd0b59674daca26223b560b9bb6bf56264c2"
@@ -25,6 +28,10 @@ sources:
25
28
sha256 : " 32f12ff15ec257e3462883f84bc291c2d5dc30055604c12ec4b46a36dfa3f189"
26
29
27
30
patches :
31
+ " 1.8.2 " :
32
+ - patch_file : " patches/1.8.2-0001-fix-cmake.patch"
33
+ patch_description : " fix lack of linking libraries due to conan not generating the variables that are expected"
34
+ patch_type : " conan"
28
35
" 1.8.1 " :
29
36
- patch_file : " patches/1.8.1-0001-fix-cmake.patch"
30
37
patch_description : " fix lack of linking libraries due to conan not generating the variables that are expected"
Original file line number Diff line number Diff line change
1
+ diff --git a/CMakeLists.txt b/CMakeLists.txt
2
+ index 9df8f5c..43b9d82 100644
3
+ --- a/CMakeLists.txt
4
+ +++ b/CMakeLists.txt
5
+ @@ -251,7 +251,6 @@ if(WITH_JAEGER)
6
+ find_package(Thrift QUIET)
7
+ if(Thrift_FOUND)
8
+ find_package(Boost REQUIRED)
9
+ - include_directories(${Boost_INCLUDE_DIR})
10
+ else()
11
+ # Install Thrift and propagate via vcpkg toolchain file
12
+ if(WIN32 AND (NOT DEFINED CMAKE_TOOLCHAIN_FILE))
13
+ diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake
14
+ index a21c0f1..a467ffd 100644
15
+ --- a/cmake/opentelemetry-proto.cmake
16
+ +++ b/cmake/opentelemetry-proto.cmake
17
+ @@ -280,6 +280,10 @@ else() # cmake 3.8 or lower
18
+ target_link_libraries(opentelemetry_proto INTERFACE ${Protobuf_LIBRARIES})
19
+ endif()
20
+
21
+ + if(TARGET gRPC::grpc++)
22
+ + target_link_libraries(opentelemetry_proto PUBLIC gRPC::grpc++)
23
+ + endif()
24
+ +
25
+ if(BUILD_SHARED_LIBS)
26
+ set_property(TARGET opentelemetry_proto PROPERTY POSITION_INDEPENDENT_CODE ON)
27
+ endif()
Original file line number Diff line number Diff line change 1
1
cmake_minimum_required (VERSION 3.8)
2
2
3
- project (test_package CXX )
3
+ project (test_package)
4
4
5
5
include (${CMAKE_BINARY_DIR} /conanbuildinfo.cmake)
6
6
conan_basic_setup(TARGETS)
7
7
8
- find_package (opentelemetry-cpp REQUIRED CONFIG)
9
-
10
- add_executable (${PROJECT_NAME} ../test_package/test_package.cpp)
11
- target_link_libraries (${PROJECT_NAME} PRIVATE opentelemetry-cpp::opentelemetry-cpp)
12
- target_compile_features (${PROJECT_NAME} PRIVATE cxx_std_11)
8
+ add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR} /../test_package/
9
+ ${CMAKE_CURRENT_BINARY_DIR} /test_package/)
Original file line number Diff line number Diff line change 1
1
versions :
2
+ " 1.8.2 " :
3
+ folder : all
2
4
" 1.8.1 " :
3
5
folder : all
4
6
" 1.7.0 " :
You can’t perform that action at this time.
0 commit comments