DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Change how we set cmake policy (#1288)

Browse Source 
Summary:
X-link: https://github.com/facebook/react-native/pull/37349

Pull Request resolved: https://github.com/facebook/yoga/pull/1288

Fixes https://github.com/facebook/yoga/issues/1283

New versions of CMake add "policies" which control how the build system acts wrt breaking changes. By default, CMake will emulate the behavior of the version specified in `cmake_minimum_required`.

Setting a policy to true (to opt into new behavior where `cmake_minimum_required` is lower than the current version) seems actually just error out on the old versions.

Googling around, apparently the way I should be doing this is to specify `<policy_max>` as part of `cmake_minimum_required `. https://gitlab.kitware.com/cmake/cmake/-/issues/20392

This should I think use new policies introduced up to 3.26 (what we test on right now), while letting 3.13 be the minimum.

Reviewed By: cortinico

Differential Revision: D45724864

fbshipit-source-id: 120cc2015a043605e7c07ef0459667643a4284b7
This commit is contained in:
Nick Gerleman
2023-05-15 15:21:56 -07:00
committed by Facebook GitHub Bot
parent 3fb698c08b
commit f2b4e42ca2
6 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -3,7 +3,7 @@
# This source code is licensed under the MIT license found in the # This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree. # LICENSE file in the root directory of this source tree.
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13...3.26)
project(yoga-all) project(yoga-all)
set(CMAKE_VERBOSE_MAKEFILE on) set(CMAKE_VERBOSE_MAKEFILE on)

2
benchmark/CMakeLists.txt
View File

@@ -4,7 +4,7 @@
# LICENSE file in the root directory of this source tree. # LICENSE file in the root directory of this source tree.
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13...3.26)
project(benchmark) project(benchmark)
set(CMAKE_VERBOSE_MAKEFILE on) set(CMAKE_VERBOSE_MAKEFILE on)

2
java/CMakeLists.txt
View File

@@ -3,7 +3,7 @@
# This source code is licensed under the MIT license found in the # This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree. # LICENSE file in the root directory of this source tree.
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13...3.26)
project(yogajni) project(yogajni)
set(CMAKE_VERBOSE_MAKEFILE on) set(CMAKE_VERBOSE_MAKEFILE on)

2
javascript/CMakeLists.txt
View File

@@ -3,7 +3,7 @@
# This source code is licensed under the MIT license found in the # This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree. # LICENSE file in the root directory of this source tree.
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13...3.26)
set(CMAKE_VERBOSE_MAKEFILE on) set(CMAKE_VERBOSE_MAKEFILE on)
project(yoga) project(yoga)

3
tests/CMakeLists.txt
View File

@@ -4,7 +4,7 @@
# LICENSE file in the root directory of this source tree. # LICENSE file in the root directory of this source tree.
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13...3.26)
project(tests) project(tests)
set(CMAKE_VERBOSE_MAKEFILE on) set(CMAKE_VERBOSE_MAKEFILE on)
@@ -15,7 +15,6 @@ set(YOGA_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/..)
include(${YOGA_ROOT}/cmake/project-defaults.cmake) include(${YOGA_ROOT}/cmake/project-defaults.cmake)
# Fetch GTest # Fetch GTest
cmake_policy(SET CMP0135 NEW)
FetchContent_Declare( FetchContent_Declare(
googletest googletest
URL https://github.com/google/googletest/archive/refs/tags/release-1.12.1.zip URL https://github.com/google/googletest/archive/refs/tags/release-1.12.1.zip

2
yoga/CMakeLists.txt
View File

@@ -4,7 +4,7 @@
# LICENSE file in the root directory of this source tree. # LICENSE file in the root directory of this source tree.
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13...3.26)
project(yogacore) project(yogacore)
set(CMAKE_VERBOSE_MAKEFILE on) set(CMAKE_VERBOSE_MAKEFILE on)