From 64df9abe99d08162bb09cf588e95841e1b35011b Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Tue, 20 Jul 2021 17:59:07 +0530 Subject: [PATCH 1/4] vcpkg toolchain file document --- docs/building-with-vcpkg.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/building-with-vcpkg.md b/docs/building-with-vcpkg.md index 8a51c988f1..4c184c80ff 100644 --- a/docs/building-with-vcpkg.md +++ b/docs/building-with-vcpkg.md @@ -102,6 +102,18 @@ dependencies: C++14 or C++17 compiler. - `nlohmann-json` - required when building with zPages module. - `prometheus-cpp` - required for Prometheus exporter. +- `gRPC` and `Protobuf` - required for otlp exporter It is possible to adjust the build system to use either vcpkg-installed dependencies or OS-provided dependencies, e.g. `brew` or `deb` packages. +To install the dependencies through vcpkg, + +- Set the VCPKG_ROOT env variable to the vcpkg install directory, or +- Set the CMake variable CMAKE_TOOLCHAIN_FILE to vcpkg toolchain file (vcpkg.cmake). + +With either of these settings, the appropriate vcpkg folders get added to the cmake +search path, and makes the required libraries to be found through `find_package()`. + +The opentelemetry-cpp repo also brings the vcpkg package under `tools` directory. +This would be used during Windows builds to install the missing dependencies ONLY +if the external vcpkg toolchain is not configured. From 7d384374e722b3aa6c74453a90a151c68b39daad Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Tue, 20 Jul 2021 17:59:33 +0530 Subject: [PATCH 2/4] vcpkg toolchain file document --- docs/building-with-vcpkg.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/building-with-vcpkg.md b/docs/building-with-vcpkg.md index 4c184c80ff..93a59926ed 100644 --- a/docs/building-with-vcpkg.md +++ b/docs/building-with-vcpkg.md @@ -109,7 +109,7 @@ dependencies or OS-provided dependencies, e.g. `brew` or `deb` packages. To install the dependencies through vcpkg, - Set the VCPKG_ROOT env variable to the vcpkg install directory, or -- Set the CMake variable CMAKE_TOOLCHAIN_FILE to vcpkg toolchain file (vcpkg.cmake). +- Set the CMake variable CMAKE_TOOLCHAIN_FILE to vcpkg toolchain file `vcpkg.cmake`. With either of these settings, the appropriate vcpkg folders get added to the cmake search path, and makes the required libraries to be found through `find_package()`. From e97d05e26ed3ea8d735b238e6ef3a65449d19c6f Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Tue, 20 Jul 2021 19:45:52 +0530 Subject: [PATCH 3/4] format fix --- docs/building-with-vcpkg.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/building-with-vcpkg.md b/docs/building-with-vcpkg.md index 93a59926ed..2065884dd1 100644 --- a/docs/building-with-vcpkg.md +++ b/docs/building-with-vcpkg.md @@ -110,7 +110,7 @@ To install the dependencies through vcpkg, - Set the VCPKG_ROOT env variable to the vcpkg install directory, or - Set the CMake variable CMAKE_TOOLCHAIN_FILE to vcpkg toolchain file `vcpkg.cmake`. - + With either of these settings, the appropriate vcpkg folders get added to the cmake search path, and makes the required libraries to be found through `find_package()`. From 9e3082d4a7c11a0af607dda820c48739bed72b2a Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Tue, 20 Jul 2021 21:08:59 +0530 Subject: [PATCH 4/4] Update docs/building-with-vcpkg.md Co-authored-by: Reiley Yang --- docs/building-with-vcpkg.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/building-with-vcpkg.md b/docs/building-with-vcpkg.md index 2065884dd1..7586486e88 100644 --- a/docs/building-with-vcpkg.md +++ b/docs/building-with-vcpkg.md @@ -102,7 +102,7 @@ dependencies: C++14 or C++17 compiler. - `nlohmann-json` - required when building with zPages module. - `prometheus-cpp` - required for Prometheus exporter. -- `gRPC` and `Protobuf` - required for otlp exporter +- `gRPC` and `Protobuf` - required for OTLP exporter It is possible to adjust the build system to use either vcpkg-installed dependencies or OS-provided dependencies, e.g. `brew` or `deb` packages.