From 0aa445bb9c5f307ad7be1e38bc04af5b17864c12 Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Sun, 2 Jun 2024 18:31:03 +1000 Subject: GoogleTest: Modernize policies using block() / endblock() --- Modules/GoogleTest.cmake | 6 +++--- Modules/GoogleTestAddTests.cmake | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Modules/GoogleTest.cmake b/Modules/GoogleTest.cmake index e187804..dc445de 100644 --- a/Modules/GoogleTest.cmake +++ b/Modules/GoogleTest.cmake @@ -286,8 +286,8 @@ same as the Google Test name (i.e. ``suite.testcase``); see also #]=======================================================================] # Save project's policies -cmake_policy(PUSH) -cmake_policy(SET CMP0057 NEW) # if IN_LIST +block(SCOPE_FOR POLICIES) +cmake_policy(VERSION 3.30) #------------------------------------------------------------------------------ function(gtest_add_tests) @@ -630,4 +630,4 @@ endfunction() ############################################################################### # Restore project's policies -cmake_policy(POP) +endblock() diff --git a/Modules/GoogleTestAddTests.cmake b/Modules/GoogleTestAddTests.cmake index eea267d..dc1cc7d 100644 --- a/Modules/GoogleTestAddTests.cmake +++ b/Modules/GoogleTestAddTests.cmake @@ -1,7 +1,7 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -cmake_minimum_required(VERSION ${CMAKE_VERSION}) +cmake_minimum_required(VERSION 3.30) # Overwrite possibly existing ${_CTEST_FILE} with empty file set(flush_tests_MODE WRITE) -- cgit v0.12