From 383018dbb8e0193db72729e433d2d5e04b2db406 Mon Sep 17 00:00:00 2001 From: dundargoc Date: Sat, 27 Apr 2024 20:57:46 +0200 Subject: [PATCH] build: simplify policy-setting for dependencies Passing `CMAKE_POLICY_DEFAULT_CMP0092=NEW` to all dependencies is simpler than setting it manually in each file. --- cmake.deps/cmake/GettextCMakeLists.txt | 5 ----- cmake.deps/cmake/LibiconvCMakeLists.txt | 4 ---- cmake.deps/cmake/LibvtermCMakeLists.txt | 4 ---- cmake.deps/cmake/MarkdownParserCMakeLists.txt | 4 ---- cmake.deps/cmake/TreesitterCMakeLists.txt | 4 ---- cmake.deps/cmake/TreesitterParserCMakeLists.txt | 4 ---- cmake/Deps.cmake | 5 +++++ 7 files changed, 5 insertions(+), 25 deletions(-) diff --git a/cmake.deps/cmake/GettextCMakeLists.txt b/cmake.deps/cmake/GettextCMakeLists.txt index 16fce4485f..c36f3aada5 100644 --- a/cmake.deps/cmake/GettextCMakeLists.txt +++ b/cmake.deps/cmake/GettextCMakeLists.txt @@ -1,9 +1,4 @@ cmake_minimum_required(VERSION 3.13) - -# Can be removed once minimum version is at least 3.15 -if(POLICY CMP0092) - cmake_policy(SET CMP0092 NEW) -endif() project(gettext C) add_compile_options(-w) diff --git a/cmake.deps/cmake/LibiconvCMakeLists.txt b/cmake.deps/cmake/LibiconvCMakeLists.txt index 220e3e07cb..e62b479b6b 100644 --- a/cmake.deps/cmake/LibiconvCMakeLists.txt +++ b/cmake.deps/cmake/LibiconvCMakeLists.txt @@ -1,8 +1,4 @@ cmake_minimum_required(VERSION 3.13) -# Can be removed once minimum version is at least 3.15 -if(POLICY CMP0092) - cmake_policy(SET CMP0092 NEW) -endif() project(libiconv C) add_compile_options(-w) diff --git a/cmake.deps/cmake/LibvtermCMakeLists.txt b/cmake.deps/cmake/LibvtermCMakeLists.txt index 41c79a915f..272a31ed9d 100644 --- a/cmake.deps/cmake/LibvtermCMakeLists.txt +++ b/cmake.deps/cmake/LibvtermCMakeLists.txt @@ -1,8 +1,4 @@ cmake_minimum_required(VERSION 3.13) -# Can be removed once minimum version is at least 3.15 -if(POLICY CMP0092) - cmake_policy(SET CMP0092 NEW) -endif() project(libvterm C) add_compile_options(-w) diff --git a/cmake.deps/cmake/MarkdownParserCMakeLists.txt b/cmake.deps/cmake/MarkdownParserCMakeLists.txt index 8ee149e774..981bf4dfd7 100644 --- a/cmake.deps/cmake/MarkdownParserCMakeLists.txt +++ b/cmake.deps/cmake/MarkdownParserCMakeLists.txt @@ -1,8 +1,4 @@ cmake_minimum_required(VERSION 3.13) -# Can be removed once minimum version is at least 3.15 -if(POLICY CMP0092) - cmake_policy(SET CMP0092 NEW) -endif() project(${PARSERLANG} C) add_compile_options(-w) diff --git a/cmake.deps/cmake/TreesitterCMakeLists.txt b/cmake.deps/cmake/TreesitterCMakeLists.txt index f1e0d4e575..71174bfe5b 100644 --- a/cmake.deps/cmake/TreesitterCMakeLists.txt +++ b/cmake.deps/cmake/TreesitterCMakeLists.txt @@ -1,8 +1,4 @@ cmake_minimum_required(VERSION 3.13) -# Can be removed once minimum version is at least 3.15 -if(POLICY CMP0092) - cmake_policy(SET CMP0092 NEW) -endif() project(treesitter C) add_compile_options(-w) diff --git a/cmake.deps/cmake/TreesitterParserCMakeLists.txt b/cmake.deps/cmake/TreesitterParserCMakeLists.txt index c71a0a8f9b..0d4bbf0508 100644 --- a/cmake.deps/cmake/TreesitterParserCMakeLists.txt +++ b/cmake.deps/cmake/TreesitterParserCMakeLists.txt @@ -1,8 +1,4 @@ cmake_minimum_required(VERSION 3.13) -# Can be removed once minimum version is at least 3.15 -if(POLICY CMP0092) - cmake_policy(SET CMP0092 NEW) -endif() project(parser C) add_compile_options(-w) diff --git a/cmake/Deps.cmake b/cmake/Deps.cmake index 214e015d1c..0d4cb7d469 100644 --- a/cmake/Deps.cmake +++ b/cmake/Deps.cmake @@ -18,6 +18,11 @@ if(APPLE) list(APPEND DEPS_CMAKE_ARGS -D CMAKE_FIND_FRAMEWORK=${CMAKE_FIND_FRAMEWORK}) endif() +# Can be removed once minimum version is at least 3.15 +if(POLICY CMP0092) + list(APPEND DEPS_CMAKE_ARGS -D CMAKE_POLICY_DEFAULT_CMP0092=NEW) +endif() + # MAKE_PRG if(UNIX) find_program(MAKE_PRG NAMES gmake make)