Set cmake minimum required version to 3.16. Update cmake install test runner to install the min cmake version. Fix issues found

Author: dbarker

.github/workflows/cmake_install.yml

@@ -135,11 +135,13 @@ jobs:
         BUILD_SHARED_LIBS: 'ON'
       run: ./ci/do_ci.sh cmake.install.test
 
-  ubuntu_2204_script_build_grpc_1_49_2:
-    name: Ubuntu 22.04 script grpc 1.49.2 cxx14 (static libs - shared libs)
+  ubuntu_2204_min_cmake_version:
+    name: Ubuntu 22.04 min cmake version (static libs - shared libs)
     runs-on: ubuntu-22.04
     env:
       INSTALL_TEST_DIR: '/home/runner/install_test'
+      CMAKE_VERSION: '3.16.9'
+      GOOGLETEST_VERSION: '1.14.0'
       CXX_STANDARD: '14'
       BUILD_TYPE: 'Debug'
     steps:

CMakeLists.txt

@@ -1,23 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.10)
-
-# 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
@@ -166,8 +150,6 @@ else()
   endif()
 endif()
 
-message(STATUS "OPENTELEMETRY_ABI_VERSION_NO=${OPENTELEMETRY_ABI_VERSION_NO}")
-
 if(OPENTELEMETRY_CPP_HEADER_VERSION_H MATCHES
    "OPENTELEMETRY_VERSION[ \t\r\n]+\"?([^\"]+)\"?")
   set(OPENTELEMETRY_VERSION ${CMAKE_MATCH_1})
@@ -178,8 +160,6 @@ else()
   )
 endif()
 
-message(STATUS "OPENTELEMETRY_VERSION=${OPENTELEMETRY_VERSION}")
-
 option(WITH_NO_DEPRECATED_CODE "Do not include deprecated code" OFF)
 
 set(WITH_STL
@@ -399,7 +379,7 @@ if(WITH_PROMETHEUS)
         string(REGEX REPLACE "^v" "" prometheus-cpp_VERSION
                              "${prometheus-cpp_VERSION}")
       endif()
-
+      set(prometheus-cpp_FOUND TRUE)
       message(
         STATUS
           "Using local prometheus-cpp from submodule. Version = ${prometheus-cpp_VERSION}"
@@ -421,8 +401,6 @@ if(WITH_OTLP_GRPC
    OR WITH_OTLP_FILE)
 
   find_package(Protobuf)
-  # Protobuf 3.22 or upper require abseil-cpp, we can find it in
-  # opentelemetry-cpp-config.cmake
 
   if(WITH_OTLP_GRPC)
     find_package(gRPC CONFIG)
@@ -671,8 +649,6 @@ if(BUILD_TESTING)
   if(GTEST_INCLUDE_DIRS)
     include_directories(SYSTEM ${GTEST_INCLUDE_DIRS})
   endif()
-  message(STATUS "GTEST_INCLUDE_DIRS   = ${GTEST_INCLUDE_DIRS}")
-  message(STATUS "GTEST_BOTH_LIBRARIES = ${GTEST_BOTH_LIBRARIES}")
 
   # Try to find gmock
   if(NOT GMOCK_LIB AND TARGET GTest::gmock)
@@ -800,7 +776,7 @@ if(gRPC_FOUND)
   message(STATUS "gRPC: ${gRPC_VERSION}")
 endif()
 if(CURL_FOUND)
-  message(STATUS "CURL: ${CURL_VERSION}")
+  message(STATUS "CURL: ${CURL_VERSION_STRING}")
 endif()
 if(ZLIB_FOUND)
   message(STATUS "ZLIB: ${ZLIB_VERSION}")

ci/install_protobuf.sh

@@ -70,7 +70,7 @@ if [ -e "../CMakeLists.txt" ]; then
 else
   cmake ../cmake "${CPP_PROTOBUF_BUILD_OPTIONS[@]}"
 fi
-cmake --build . -j $(nproc)
-cmake --install .
+make -j $(nproc)
+make install
 popd
 ldconfig

ci/setup_cmake.sh

@@ -6,27 +6,43 @@
 set -e
 
 CMAKE_VERSION=${CMAKE_VERSION:-3.31.6}
-CMAKE_DIR="cmake-$CMAKE_VERSION-linux-x86_64"
-CMAKE_TAR="$CMAKE_DIR.tar.gz"
-CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/$CMAKE_TAR"
+CMAKE_DIR="cmake-${CMAKE_VERSION}-linux-x86_64"
+CMAKE_TAR="${CMAKE_DIR}.tar.gz"
+CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_TAR}"
 
-echo "Installing CMake version: $CMAKE_VERSION"
+INSTALL_DIR="/opt/cmake"
+
+echo "Installing CMake version: ${CMAKE_VERSION}..."
 
 apt-get update && apt-get remove --purge -y cmake || true
 
 apt-get install -y wget tar
 
-wget "$CMAKE_URL"
-
-tar -xzf "$CMAKE_TAR"
+wget "${CMAKE_URL}"
 
-mkdir -p /opt/cmake
-mv "$CMAKE_DIR" /opt/cmake/cmake
+mkdir -p "${INSTALL_DIR}"
+tar --strip-components=1 -xzf "${CMAKE_TAR}" -C "${INSTALL_DIR}"
 
-for file in /opt/cmake/cmake/bin/*; do
-    ln -sf "$file" "/usr/local/bin/$(basename "$file")"
+for executable in "${INSTALL_DIR}/bin/"*; do
+    exe_name=$(basename "$executable")
+    ln -sf "$executable" "/usr/local/bin/$exe_name"
 done
 
-rm -f "$CMAKE_TAR"
+rm -f "${CMAKE_TAR}"
+
+echo "Verifying installed versions..."
+
+for executable in cmake ctest cpack ccmake cmake-gui; do
+    if command -v "$executable" >/dev/null 2>&1; then
+        ACTUAL_VERSION=$("$executable" --version | grep -Eo '[0-9]+(\.[0-9]+)*' | head -n 1)
+        echo "$executable version: $ACTUAL_VERSION detected"
+        if [ "$ACTUAL_VERSION" != "$CMAKE_VERSION" ]; then
+            echo "E: $executable version mismatch. Expected $CMAKE_VERSION, found '$ACTUAL_VERSION'" >&2
+            exit 1
+        fi
+    else
+        echo "E: $executable is not installed or not in PATH." >&2
+        exit 1
+    fi
+done
 
-cmake --version

ci/setup_cmake_macos.sh

@@ -11,30 +11,40 @@ CMAKE_TAR="${CMAKE_PKG}.tar.gz"
 CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_TAR}"
 
 INSTALL_DIR="/opt/cmake"
-BIN_DIR="${INSTALL_DIR}/cmake/CMake.app/Contents/bin"
 
 echo "Installing CMake version ${CMAKE_VERSION}..."
 
 if brew list cmake >/dev/null 2>&1; then
-  echo "Removing existing Homebrew-installed CMake..."
   brew uninstall cmake
 fi
 
 if ! command -v wget >/dev/null 2>&1; then
-  echo "wget not found. Installing wget via Homebrew..."
   brew install wget
 fi
 
 wget -q "${CMAKE_URL}"
-tar -xzf "${CMAKE_TAR}"
+mkdir -p "${INSTALL_DIR}"
+tar --strip-components=1 -xzf "${CMAKE_TAR}" -C "${INSTALL_DIR}"
 
-sudo mkdir -p "${INSTALL_DIR}"
-sudo mv "${CMAKE_PKG}" "${INSTALL_DIR}/cmake"
-
-for file in "${BIN_DIR}"/*; do
-  sudo ln -sf "${file}" "/usr/local/bin/$(basename "${file}")"
+for executable in "${INSTALL_DIR}/bin/"*; do
+    exe_name=$(basename "$executable")
+    ln -sf "$executable" "/usr/local/bin/$exe_name"
 done
 
 rm -f "${CMAKE_TAR}"
 
-cmake --version
+echo "Verifying installed versions..."
+
+for executable in cmake ctest cpack ccmake cmake-gui; do
+    if command -v "$executable" >/dev/null 2>&1; then
+        ACTUAL_VERSION=$("$executable" --version | grep -Eo '[0-9]+(\.[0-9]+)*' | head -n 1)
+        echo "$executable version: $ACTUAL_VERSION detected"
+        if [ "$ACTUAL_VERSION" != "$CMAKE_VERSION" ]; then
+            echo "E: $executable version mismatch. Expected $CMAKE_VERSION, found '$ACTUAL_VERSION'" >&2
+            exit 1
+        fi
+    else
+        echo "E: $executable is not installed or not in PATH." >&2
+        exit 1
+    fi
+done

ci/setup_grpc.sh

@@ -114,7 +114,9 @@ if [[ $build_internal_abseil_cpp -ne 0 ]]; then
         ABSEIL_CPP_BUILD_OPTIONS=(${ABSEIL_CPP_BUILD_OPTIONS[@]} "-DBUILD_SHARED_LIBS=$build_shared_libs")
     fi
     cmake  "${ABSEIL_CPP_BUILD_OPTIONS[@]}" ..
-    cmake --build . -j${nproc} --target install && popd
+    make -j $(nproc)
+    make install
+    popd
 fi
 mkdir -p build && pushd build
 
@@ -144,8 +146,8 @@ echo "Building gRPC ${install_grpc_version}"
 echo "CMake build options:" "${GRPC_BUILD_OPTIONS[@]}"
 
 cmake "${GRPC_BUILD_OPTIONS[@]}" ..
-cmake --build . -j$(nproc)
-cmake --install .
+make -j $(nproc)
+make install
 popd
 popd
 

docker/grpc/CMakeLists.txt

@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.11 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 
 project(
   dependencies

install/test/cmake/CMakeLists.txt

@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.16)
 project(opentelemetry-cpp-component-install-tests LANGUAGES CXX)
 
 if(NOT INSTALL_TEST_CMAKE_OPTIONS)

install/test/cmake/component_tests/api/CMakeLists.txt

@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.16)
 
 project(opentelemetry-cpp-api-install-test LANGUAGES CXX)
 
@@ -11,7 +11,7 @@ find_package(GTest REQUIRED)
 include(GoogleTest)
 
 add_executable(api_test ${INSTALL_TEST_SRC_DIR}/test_api.cc)
-target_link_libraries(api_test PRIVATE opentelemetry-cpp::api GTest::gtest
-                                       GTest::gtest_main)
+target_link_libraries(api_test PRIVATE opentelemetry-cpp::api GTest::GTest
+                                       GTest::Main)
 
 gtest_discover_tests(api_test)

install/test/cmake/component_tests/exporters_elasticsearch/CMakeLists.txt

@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.16)
 project(opentelemetry-cpp-exporters-elasticsearch-install-test LANGUAGES CXX)
 
 find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_elasticsearch)
@@ -17,7 +17,7 @@ add_executable(exporters_elasticsearch_test
                ${INSTALL_TEST_SRC_DIR}/test_exporters_elasticsearch.cc)
 target_link_libraries(
   exporters_elasticsearch_test
-  PRIVATE opentelemetry-cpp::elasticsearch_log_record_exporter GTest::gtest
-          GTest::gtest_main)
+  PRIVATE opentelemetry-cpp::elasticsearch_log_record_exporter GTest::GTest
+          GTest::Main)
 
 gtest_discover_tests(exporters_elasticsearch_test)