Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
runs-on: ubuntu-24.04
env:
CXX_STANDARD: '17'
CMAKE_VERSION: '3.14.0'
CMAKE_VERSION: '3.16.0'
BUILD_TYPE: 'Debug'
steps:
- name: Harden the runner (Audit all outbound calls)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cmake_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:
env:
INSTALL_TEST_DIR: '/home/runner/install_test'
# Set to the current minimum version of cmake
CMAKE_VERSION: '3.14.0'
CMAKE_VERSION: '3.16.0'
# cxx14 is the default for Ubuntu 22.04
CXX_STANDARD: '14'
BUILD_TYPE: 'Debug'
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ Increment the:
* [SDK] View should not have a unit
[#3552](https://github.com/open-telemetry/opentelemetry-cpp/pull/3552)

Important changes:

* [CMAKE] Upgrade CMake minimum version to 3.16
[#3599](https://github.com/open-telemetry/opentelemetry-cpp/pull/3599)

Breaking changes:

* [SDK] View should not have a unit
Expand Down
18 changes: 1 addition & 17 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)

# See https://cmake.org/cmake/help/latest/policy/CMP0074.html required by
# certain version of zlib which CURL depends on.
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12")
cmake_policy(SET CMP0074 NEW)
endif()

# Allow to use normal variable for option()
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13")
cmake_policy(SET CMP0077 NEW)
endif()

# Prefer CMAKE_MSVC_RUNTIME_LIBRARY if possible
if(POLICY CMP0091)
cmake_policy(SET CMP0091 NEW)
endif()
cmake_minimum_required(VERSION 3.16)

if(POLICY CMP0092)
# https://cmake.org/cmake/help/latest/policy/CMP0092.html#policy:CMP0092 Make
Expand Down
3 changes: 1 addition & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ You can link OpenTelemetry C++ SDK with libraries provided in
repository. To install Git, consult the [Set up
Git](https://help.github.com/articles/set-up-git/) guide on GitHub.
- [CMake](https://cmake.org/) for building opentelemetry-cpp API, SDK with their
unittests. The minimum CMake version is 3.14.
CMake 3.15+ is recommended on Windows due to known CI test failures with 3.14.
unittests. The minimum CMake version is 3.16.
To install CMake,
consult the [Installing CMake](https://cmake.org/install/) guide.
- [GoogleTest](https://github.com/google/googletest) framework to build and run
Expand Down
2 changes: 1 addition & 1 deletion install/cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# CMAKE_CXX_STANDARD: The C++ standard to use for all third-party packages.
# Defaults to 14 if not set.

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)
project(opentelemetry-cpp-thirdparty-install LANGUAGES CXX)

# Added in CMake 3.16. ExternalProject_Add() with GIT_SUBMODULES "" initializes
Expand Down
2 changes: 1 addition & 1 deletion install/test/cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)
project(opentelemetry-cpp-component-install-tests LANGUAGES CXX)

if(NOT INSTALL_TEST_CMAKE_OPTIONS)
Expand Down
2 changes: 1 addition & 1 deletion install/test/cmake/component_tests/api/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)

project(opentelemetry-cpp-api-install-test LANGUAGES CXX)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)
project(opentelemetry-cpp-exporters-elasticsearch-install-test LANGUAGES CXX)

find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_elasticsearch)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)
project(opentelemetry-cpp-exporters_etw-install-test LANGUAGES CXX)

find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_etw)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)
project(opentelemetry-cpp-exporters-in-memory-install-test LANGUAGES CXX)

find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_in_memory)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)
project(opentelemetry-cpp-exporters-ostream-install-test LANGUAGES CXX)

find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_ostream)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)
project(opentelemetry-cpp-exporters-otlp-common-install-test LANGUAGES CXX)

find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_otlp_common)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)
project(opentelemetry-cpp-exporters-otlp-file-install-test LANGUAGES CXX)

find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_otlp_file)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)
project(opentelemetry-cpp-exporters-otlp-grpc-install-test LANGUAGES CXX)

find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_otlp_grpc)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)
project(opentelemetry-cpp-exporters-otlp-http-install-test LANGUAGES CXX)

find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_otlp_http)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)
project(opentelemetry-cpp-exporters-prometheus-install-test LANGUAGES CXX)

find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_prometheus)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)
project(opentelemetry-cpp-exporters-zipkin-install-test LANGUAGES CXX)

find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_zipkin)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)
project(opentelemetry-cpp-ext_common-install-test LANGUAGES CXX)

find_package(opentelemetry-cpp REQUIRED COMPONENTS ext_common)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)
project(opentelemetry-cpp-ext_dll-install-test LANGUAGES CXX)

find_package(opentelemetry-cpp REQUIRED COMPONENTS ext_dll exporters_ostream)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)
project(opentelemetry-cpp-ext_http_curl-install-test LANGUAGES CXX)

find_package(opentelemetry-cpp REQUIRED COMPONENTS ext_http_curl)
Expand Down
2 changes: 1 addition & 1 deletion install/test/cmake/component_tests/sdk/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)
project(opentelemetry-cpp-sdk-install-test LANGUAGES CXX)

find_package(opentelemetry-cpp REQUIRED COMPONENTS sdk)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)
project(opentelemetry-cpp-shims_opentracing-install-test LANGUAGES CXX)

find_package(opentelemetry-cpp REQUIRED COMPONENTS shims_opentracing)
Expand Down
2 changes: 1 addition & 1 deletion install/test/cmake/examples_test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)

project(opentelemetry-cpp-examples-test LANGUAGES CXX)

Expand Down
2 changes: 1 addition & 1 deletion install/test/cmake/fetch_content_test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# This test uses CMake's FetchContent module to build opentelemetry-cpp from src
# and make its targets available within an external project.

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)

project(opentelemetry-cpp-fetch-content-test LANGUAGES CXX)

Expand Down
2 changes: 1 addition & 1 deletion install/test/cmake/package_test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)

project(opentelemetry-cpp-full-package-install-test LANGUAGES CXX)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)

project(opentelemetry-cpp-unsorted-components-install-test LANGUAGES CXX)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)

project(opentelemetry-cpp-unsorted-components-install-test LANGUAGES CXX)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)

project(opentelemetry-cpp-unsorted-components-install-test LANGUAGES CXX)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.16)

project(opentelemetry-cpp-unsupported-components-install-test LANGUAGES CXX)

Expand Down
Loading