From 594a93f8ac9e524775ffc9609daa366fd849eea1 Mon Sep 17 00:00:00 2001 From: ytnuf <161308826+ytnuf@users.noreply.github.com> Date: Wed, 20 Mar 2024 19:25:56 +0000 Subject: [PATCH] Change cmake_minimum_required to match actual requirements This is because target_link_options was added in v3.13 So this wouldn't build with cmake v3.12 Likewise in CMAKE_CXX_STANDARD only supports value of 17 starting with cmake v3.9 So the test wouldn't build properly with cmake v3.6 (cherry picked from commit 5c12bd22872742f274079fb11e6d884d4dd2723e) --- CMakeLists.txt | 2 +- test/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a9603ab6..dd43a04d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ # Todo # Test build for Windows, Mac and mingw. -cmake_minimum_required(VERSION 3.12) +cmake_minimum_required(VERSION 3.13) project(godot-cpp LANGUAGES CXX) option(GENERATE_TEMPLATE_GET_NODE "Generate a template version of the Node class's get_node." ON) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a17b9aac..c0457bfb 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,5 +1,5 @@ +cmake_minimum_required(VERSION 3.13) project(godot-cpp-test) -cmake_minimum_required(VERSION 3.6) set(GODOT_GDEXTENSION_DIR ../gdextension/ CACHE STRING "Path to GDExtension interface header directory") set(CPP_BINDINGS_PATH ../ CACHE STRING "Path to C++ bindings")