From 62e73a7d10fdfcc81dd3a06e873e662bf2137168 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 8 Oct 2020 11:58:06 -0400 Subject: Tests: Fix policy version in RunCMake.ExternalProject test Now that we have policies that need to be tested, this test cannot just use CMAKE_VERSION for the policy level. --- Tests/RunCMake/ExternalProject/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/RunCMake/ExternalProject/CMakeLists.txt b/Tests/RunCMake/ExternalProject/CMakeLists.txt index 9cb093a..933a57a 100644 --- a/Tests/RunCMake/ExternalProject/CMakeLists.txt +++ b/Tests/RunCMake/ExternalProject/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION ${CMAKE_VERSION}) +cmake_minimum_required(VERSION 3.18) project(${RunCMake_TEST} NONE) if(CMAKE_XCODE_BUILD_SYSTEM VERSION_GREATER_EQUAL 12 AND NOT RunCMake_TEST STREQUAL "Xcode-CMP0114") cmake_policy(SET CMP0114 NEW) -- cgit v0.12 From ac765f5eff5cc8297a528d036f4104b3bf39f3e6 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 8 Oct 2020 11:58:45 -0400 Subject: FetchContent: Remove unnecessary policy CMP0114 setting Now that `CMAKE_VERSION` is at least 3.19, the policy will be set to NEW implicitly by the version. --- Modules/FetchContent/CMakeLists.cmake.in | 1 - 1 file changed, 1 deletion(-) diff --git a/Modules/FetchContent/CMakeLists.cmake.in b/Modules/FetchContent/CMakeLists.cmake.in index 9516418..45e4df0 100644 --- a/Modules/FetchContent/CMakeLists.cmake.in +++ b/Modules/FetchContent/CMakeLists.cmake.in @@ -2,7 +2,6 @@ # file Copyright.txt or https://cmake.org/licensing for details. cmake_minimum_required(VERSION ${CMAKE_VERSION}) -cmake_policy(SET CMP0114 NEW) # We name the project and the target for the ExternalProject_Add() call # to something that will highlight to the user what we are working on if -- cgit v0.12