File tree Expand file tree Collapse file tree 4 files changed +11
-6
lines changed
Expand file tree Collapse file tree 4 files changed +11
-6
lines changed Original file line number Diff line number Diff line change @@ -254,6 +254,7 @@ jobs:
254254 run : |
255255 sudo -E ./ci/setup_cmake.sh
256256 conan install install/conan/conanfile_stable.txt --build=missing -of /home/runner/conan -s build_type=${BUILD_TYPE} -s compiler.cppstd=${CXX_STANDARD}
257+ conan cache clean --source --build
257258 - name : Run Tests (static libs)
258259 env :
259260 BUILD_SHARED_LIBS : ' OFF'
@@ -297,6 +298,7 @@ jobs:
297298 run : |
298299 sudo -E ./ci/setup_cmake.sh
299300 conan install install/conan/conanfile_latest.txt --build=missing -of /home/runner/conan -s build_type=${BUILD_TYPE} -s compiler.cppstd=${CXX_STANDARD}
301+ conan cache clean --source --build
300302 - name : Run Tests (static libs)
301303 env :
302304 BUILD_SHARED_LIBS : ' OFF'
@@ -330,7 +332,9 @@ jobs:
330332 ./ci/setup_cmake_macos.sh
331333 conan profile detect --force
332334 - name : Install or build all dependencies with Conan
333- run : conan install install/conan/conanfile_stable.txt --build=missing -of /Users/runner/conan -s build_type=${BUILD_TYPE} -s compiler.cppstd=${CXX_STANDARD}
335+ run : |
336+ conan install install/conan/conanfile_stable.txt --build=missing -of /Users/runner/conan -s build_type=${BUILD_TYPE} -s compiler.cppstd=${CXX_STANDARD}
337+ conan cache clean --source --build
334338 - name : Run Tests (static libs)
335339 env :
336340 BUILD_SHARED_LIBS : ' OFF'
Original file line number Diff line number Diff line change @@ -467,13 +467,13 @@ switch ($action) {
467467 $CMAKE_OPTIONS = @ (
468468 " -DCMAKE_CXX_STANDARD=17" ,
469469 " -DVCPKG_TARGET_TRIPLET=x64-windows" ,
470- " -DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR /scripts/buildsystems/vcpkg.cmake"
470+ " -DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR /scripts/buildsystems/vcpkg.cmake" ,
471+ " -DOPENTELEMETRY_BUILD_DLL=1"
471472 )
472473
473474 cmake $SRC_DIR `
474475 $CMAKE_OPTIONS `
475476 " -DCMAKE_INSTALL_PREFIX=$INSTALL_TEST_DIR " `
476- - DOPENTELEMETRY_BUILD_DLL= 1 `
477477 - DWITH_ABI_VERSION_1= ON `
478478 - DWITH_ABI_VERSION_2= OFF `
479479 - DWITH_THREAD_INSTRUMENTATION_PREVIEW= ON `
Original file line number Diff line number Diff line change @@ -127,7 +127,7 @@ int main(int argc, char **argv)
127127 uint16_t port;
128128 if (argc > 1 )
129129 {
130- port = atoi (argv[1 ]);
130+ port = static_cast < uint16_t >( atoi (argv[1 ]) );
131131 }
132132 else
133133 {
Original file line number Diff line number Diff line change @@ -16,8 +16,9 @@ set_target_properties(opentelemetry_cpp PROPERTIES EXPORT_NAME
1616 opentelemetry_cpp)
1717
1818target_link_libraries (
19- opentelemetry_cpp PRIVATE opentelemetry_trace
20- opentelemetry_exporter_ostream_span)
19+ opentelemetry_cpp
20+ PUBLIC opentelemetry_api
21+ PRIVATE opentelemetry_trace opentelemetry_exporter_ostream_span)
2122
2223target_include_directories (
2324 opentelemetry_cpp
You can’t perform that action at this time.
0 commit comments