mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-26 08:08:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'rel-3.19-policy-settings' into release-3.19

Browse Source 
ac765f5eff FetchContent: Remove unnecessary policy CMP0114 setting
62e73a7d10 Tests: Fix policy version in RunCMake.ExternalProject test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5350
This commit is contained in:
Brad King
2020-10-08 16:19:04 +00:00
committed by Kitware Robot
parent 302b00a262 ac765f5eff
commit 488141fe37
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/FetchContent/CMakeLists.cmake.in
-1
View File
@@ -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
Tests/RunCMake/ExternalProject/CMakeLists.txt
+1 -1
View File
@@ -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)