From c8c27cbfd11f9ad8ca6c188c99961b38d378f23b Mon Sep 17 00:00:00 2001 From: arcum42 Date: Tue, 19 May 2020 22:15:47 -0700 Subject: [PATCH] Bump up the minimum cmake version slightly, and make older versions happy with the regex in FindHarfbuzz.cmake. --- CMakeLists.txt | 2 +- cmake/FindHarfBuzz.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f0d6c6c084..2983b2a397 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ project(Pcsx2) # # Setting it to a range tells it that it supports the features on the newer # versions as well, avoiding setting policies. -cmake_minimum_required(VERSION 3.0.2...3.17) +cmake_minimum_required(VERSION 3.3.0...3.17) # Variable to check that people use the good file set(TOP_CMAKE_WAS_SOURCED TRUE) diff --git a/cmake/FindHarfBuzz.cmake b/cmake/FindHarfBuzz.cmake index cc065ee6c2..57a3b89ff2 100644 --- a/cmake/FindHarfBuzz.cmake +++ b/cmake/FindHarfBuzz.cmake @@ -86,7 +86,7 @@ if (HarfBuzz_INCLUDE_DIR AND NOT HarfBuzz_VERSION) if (EXISTS "${HarfBuzz_INCLUDE_DIR}/hb-version.h") file(READ "${HarfBuzz_INCLUDE_DIR}/hb-version.h" _harfbuzz_version_content) - string(REGEX MATCH "#define +HB_VERSION_STRING +\"([0-9]+\.[0-9]+\.[0-9]+)\"" _dummy "${_harfbuzz_version_content}") + string(REGEX MATCH "#define +HB_VERSION_STRING +\"([0-9]+\\.[0-9]+\\.[0-9]+)\"" _dummy "${_harfbuzz_version_content}") set(HarfBuzz_VERSION "${CMAKE_MATCH_1}") endif () endif () @@ -178,4 +178,4 @@ mark_as_advanced( if (HarfBuzz_FOUND) set(HarfBuzz_LIBRARIES ${HarfBuzz_LIBRARY} ${HarfBuzz_ICU_LIBRARY}) set(HarfBuzz_INCLUDE_DIRS ${HarfBuzz_INCLUDE_DIR}) -endif () \ No newline at end of file +endif ()