commit e724ef02089bf2bb494203231fc5cb62acc2fad6
author David Benjamin <davidben@google.com> Sun Sep 08 12:40:45 2024 -0400
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Sep 11 19:39:35 2024 +0000
tree ab66d73c083ae2f26d98ef30e7672b8e616b9128
parent 229801d4979eaf56cff1bca27de8df64225d8dfa

Bump the minimum CMake version to 3.16

Per https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md

Change-Id: I26f4a3dcad0f9b448459f42a810895bd6fe06445
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/71027
Auto-Submit: David Benjamin <davidben@google.com>
Reviewed-by: Bob Beck <bbe@google.com>
Commit-Queue: David Benjamin <davidben@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d412fd..2308d57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.16)
 
 # Defer enabling C and CXX languages.
 project(BoringSSL NONE)
@@ -767,19 +767,8 @@
 endif()
 
 if(INSTALL_ENABLED)
-  # CMake versions before 3.14 do not have default destination values. Executable
-  # and library targets that use a default destination should include this
-  # variable.
-  if(CMAKE_VERSION VERSION_LESS "3.14")
-    set(INSTALL_DESTINATION_DEFAULT
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-  endif()
-
-  install(TARGETS crypto ssl
-          EXPORT OpenSSLTargets ${INSTALL_DESTINATION_DEFAULT})
-  install(TARGETS bssl DESTINATION ${INSTALL_DESTINATION_DEFAULT})
+  install(TARGETS crypto ssl EXPORT OpenSSLTargets)
+  install(TARGETS bssl)
   install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
   install(EXPORT OpenSSLTargets
           FILE OpenSSLTargets.cmake

util/generate_build_files.py

diff --git a/util/generate_build_files.py b/util/generate_build_files.py
index 50716d5..7f72321 100644
--- a/util/generate_build_files.py
+++ b/util/generate_build_files.py
@@ -400,7 +400,7 @@
     self.header = LicenseHeader("#") + R'''
 # This file is created by generate_build_files.py. Do not edit manually.
 
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.16)
 
 project(BoringSSL LANGUAGES C CXX)