mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 00:09:01 +08:00
43401f5835
* [opentelemetry-cpp] unvendor absl polyfills By default opentelemetry vendors-in a copy of some Abseil polyfills (e.g. `absl::variant`). That makes it hard (I would claim nearly impossible) to use both the abseil and the opentelemetry-cpp ports at the same time, as both define `absl::variant` in some of their headers. It seems better to always use the `-DHAVE_ABSEIL=ON` CMake option and depend on the abseil port. Outside vcpkg it may be useful to use such vendored-in copies of the code, as that "simplifies" dependency management. In the context of vcpkg that is just wasteful. Simplified how to support `abseil[cxx17]` by removing some code in opentelemetry that forcibly downgraded the compiler to use C++11. Add a missing dependency for gRPC generated code. This code indirectly depends on Abseil too. * Opentelemetry is missing a find_dependency() when -DHAVE_ABSEIL=ON
13 lines
552 B
Diff
13 lines
552 B
Diff
diff --git a/cmake/opentelemetry-cpp-config.cmake.in b/cmake/opentelemetry-cpp-config.cmake.in
|
|
index adae58d..21baab7 100644
|
|
--- a/cmake/opentelemetry-cpp-config.cmake.in
|
|
+++ b/cmake/opentelemetry-cpp-config.cmake.in
|
|
@@ -69,6 +69,7 @@ set(OPENTELEMETRY_VERSION
|
|
# ##############################################################################
|
|
|
|
find_package(Threads)
|
|
+find_dependency(absl)
|
|
|
|
set_and_check(OPENTELEMETRY_CPP_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@")
|
|
set_and_check(OPENTELEMETRY_CPP_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
|