From 1d465f627bab89cef3794a7ef89d712879d78d4a Mon Sep 17 00:00:00 2001 From: Paul Wankadia Date: Thu, 6 Jul 2023 16:33:04 +0000 Subject: [PATCH] Bump the CMake baseline to 3.13. While I'm here, fix a TODO. Change-Id: I6be0612f0a4e8f824a5ee7f5c8169877d9423bae Reviewed-on: https://code-review.googlesource.com/c/re2/+/61510 Reviewed-by: Alex Chernyakhovsky Reviewed-by: Paul Wankadia --- CMakeLists.txt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ab04226a..bdac5afd6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,8 @@ # Use of this source code is governed by a BSD-style # license that can be found in the LICENSE file. -# Old enough to support Ubuntu Bionic, -# but just the MAJOR.MINOR components. -cmake_minimum_required(VERSION 3.10) +# https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md +cmake_minimum_required(VERSION 3.13) project(RE2 CXX) include(CMakePackageConfigHelpers) @@ -96,11 +95,7 @@ if(USEPCRE) list(APPEND EXTRA_TARGET_LINK_LIBRARIES pcre) endif() -# TODO(junyer): Use string(JOIN " " ...) whenever CMake 3.12 (or newer) becomes -# the minimum required: that will make this hack slightly less filthy. For now, -# CMake does the same thing as string(CONCAT ...), basically, if we don't quote -# ${REQUIRES}, so quote it despite prevailing style. -string(REPLACE ";" " " REQUIRES "${REQUIRES}") +list(JOIN REQUIRES " " REQUIRES) set(RE2_SOURCES re2/bitmap256.cc