From 9f31370393879d17749338b4ff183d3507451fe8 Mon Sep 17 00:00:00 2001 From: owent Date: Thu, 16 Mar 2023 14:39:31 +0800 Subject: [PATCH 1/2] Fix default value of `OPENTELEMETRY_INSTALL_default`. Signed-off-by: owent --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f4fa0649ee..a64e74bc74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,9 +118,8 @@ option(WITH_GSL option(WITH_ABSEIL "Whether to use Abseil for C++latest features" OFF) +set(OPENTELEMETRY_INSTALL_default ON) if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - set(OPENTELEMETRY_INSTALL_default ON) -else() set(OPENTELEMETRY_INSTALL_default OFF) endif() option(OPENTELEMETRY_INSTALL "Whether to install opentelemetry targets" From 3a793bc8785d486d8000b09f5ed1b4f1e4898656 Mon Sep 17 00:00:00 2001 From: owent Date: Thu, 16 Mar 2023 14:43:31 +0800 Subject: [PATCH 2/2] Add changelog. Signed-off-by: owent --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94daec5ea3..8e47f770e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ Increment the: [#2036](https://github.com/open-telemetry/opentelemetry-cpp/pull/2036) * [EXPORTER] GRPC endpoint scheme should take precedence over OTEL_EXPORTER_OTLP_TRACES_INSECURE [#2060](https://github.com/open-telemetry/opentelemetry-cpp/pull/2060) +* [BUILD] Restore detfault value of `OPENTELEMETRY_INSTALL` to `ON` when it's on + top level.[#2062](https://github.com/open-telemetry/opentelemetry-cpp/pull/2062) Important changes: