From aff83446f4f5e2b0d596d9788c91df4188bc3534 Mon Sep 17 00:00:00 2001 From: Michael D Starch Date: Tue, 26 Mar 2024 10:01:15 -0700 Subject: [PATCH] Fixes #2602; bumps required version to 3.16 --- CMakeLists.txt | 2 +- FppTest/CMakeLists.txt | 2 +- RPI/CMakeLists.txt | 2 +- Ref/CMakeLists.txt | 2 +- cmake/API.cmake | 3 +-- cmake/FPrime.cmake | 2 +- cmake/deployment-CMakeLists.txt.template | 6 +++--- cmake/docs/sdd.md | 2 +- cmake/test/data/TestDeployment/CMakeLists.txt | 2 +- .../data/test-implementations/Deployment/CMakeLists.txt | 2 +- 10 files changed, 12 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a3f0ec3de..d6eedcb559 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ # # Build core F prime. #### -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) project(FPrime C CXX) set(FPRIME_FRAMEWORK_PATH "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Location of F prime framework" FORCE) set(FPRIME_PROJECT_ROOT "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Root path of F prime project" FORCE) diff --git a/FppTest/CMakeLists.txt b/FppTest/CMakeLists.txt index af9e15ff2e..43cae3f2ba 100644 --- a/FppTest/CMakeLists.txt +++ b/FppTest/CMakeLists.txt @@ -4,7 +4,7 @@ # Builds unit tests for FPP autocoder ### -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) cmake_policy(SET CMP0048 NEW) project(FppTest C CXX) diff --git a/RPI/CMakeLists.txt b/RPI/CMakeLists.txt index 40e9998578..a979871d16 100644 --- a/RPI/CMakeLists.txt +++ b/RPI/CMakeLists.txt @@ -19,7 +19,7 @@ # project definition. ## project(RPI C CXX) -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) set(FPRIME_FRAMEWORK_PATH "${CMAKE_CURRENT_LIST_DIR}/.." CACHE PATH "Location of F prime framework" FORCE) set(FPRIME_PROJECT_ROOT "${CMAKE_CURRENT_LIST_DIR}/.." CACHE PATH "Root path of F prime project" FORCE) diff --git a/Ref/CMakeLists.txt b/Ref/CMakeLists.txt index 8c509bc6e5..eea8b2badc 100644 --- a/Ref/CMakeLists.txt +++ b/Ref/CMakeLists.txt @@ -18,7 +18,7 @@ # This contains the basic project information. Specifically, a cmake version and # project definition. ## -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) cmake_policy(SET CMP0048 NEW) project(Ref VERSION 1.0.0 LANGUAGES C CXX) ## diff --git a/cmake/API.cmake b/cmake/API.cmake index f0788241d2..00007165e3 100644 --- a/cmake/API.cmake +++ b/cmake/API.cmake @@ -598,7 +598,6 @@ function(require_fprime_implementation IMPLEMENTATION) create_implementation_interface("${IMPLEMENTATION}") append_list_property("${IMPLEMENTATION}" GLOBAL PROPERTY "REQUIRED_IMPLEMENTATIONS") - append_list_property("${FPRIME_CURRENT_MODULE}" TARGET "${IMPLEMENTATION}" PROPERTY "REQUESTERS") add_dependencies("${REQUESTER}" "${IMPLEMENTATION}") endfunction() @@ -616,7 +615,7 @@ function(register_fprime_implementation IMPLEMENTATION IMPLEMENTOR) resolve_dependencies(IMPLEMENTATION "${IMPLEMENTATION}") resolve_dependencies(IMPLEMENTOR "${IMPLEMENTOR}") create_implementation_interface("${IMPLEMENTATION}") - append_list_property("${IMPLEMENTOR}" TARGET "${IMPLEMENTATION}" PROPERTY "IMPLEMENTORS") + append_list_property("${IMPLEMENTOR}" GLOBAL PROPERTY "${IMPLEMENTATION}_IMPLEMENTORS") append_list_property("${ARGN}" TARGET "${IMPLEMENTOR}" PROPERTY "REQUIRED_SOURCE_FILES") add_dependencies("${IMPLEMENTATION}" "${IMPLEMENTOR}") endfunction() diff --git a/cmake/FPrime.cmake b/cmake/FPrime.cmake index 223139442c..0a51d471c9 100644 --- a/cmake/FPrime.cmake +++ b/cmake/FPrime.cmake @@ -141,7 +141,7 @@ macro(fprime_setup_override_targets) endmacro(fprime_setup_override_targets) macro(fprime_initialize_build_system) - cmake_minimum_required(VERSION 3.13) + cmake_minimum_required(VERSION 3.16) fprime_setup_global_includes() fprime_detect_libraries() fprime_setup_standard_targets() diff --git a/cmake/deployment-CMakeLists.txt.template b/cmake/deployment-CMakeLists.txt.template index 38b4bc17e9..dd2eba4476 100644 --- a/cmake/deployment-CMakeLists.txt.template +++ b/cmake/deployment-CMakeLists.txt.template @@ -29,12 +29,12 @@ # First, the user must call `project` to setup the project and default deployment executable name. # Also the project languages "C" and "CXX" (C++) must be supplied. # -# Next, call `cmake_minimum_required` and set VERSION to 3.5 or greater. +# Next, call `cmake_minimum_required` and set VERSION to 3.16 or greater. # # **Example:** # ``` # project(Ref C CXX) -# cmake_minimum_required(VERSION 3.5) +# cmake_minimum_required(VERSION 3.16) # ``` # # ### Section 2: Include F prime Core Build System @@ -75,7 +75,7 @@ # Step 1: set ## project( C CXX) -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.16) # Optional: set CMake build type ## diff --git a/cmake/docs/sdd.md b/cmake/docs/sdd.md index 11fb9c4983..1898f81782 100644 --- a/cmake/docs/sdd.md +++ b/cmake/docs/sdd.md @@ -297,7 +297,7 @@ This should look something like the following: # This contains the basic project information. Specifically, a cmake version and # project definition. ## -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.16) project(FPrime-Ref C CXX) ## diff --git a/cmake/test/data/TestDeployment/CMakeLists.txt b/cmake/test/data/TestDeployment/CMakeLists.txt index 6b06cf0737..217f91ad54 100644 --- a/cmake/test/data/TestDeployment/CMakeLists.txt +++ b/cmake/test/data/TestDeployment/CMakeLists.txt @@ -5,7 +5,7 @@ #### # Base settings -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) cmake_policy(SET CMP0048 NEW) project(TestDeployment VERSION 1.0.0 LANGUAGES C CXX) diff --git a/cmake/test/data/test-implementations/Deployment/CMakeLists.txt b/cmake/test/data/test-implementations/Deployment/CMakeLists.txt index 35cd9fc143..e583ba0e30 100644 --- a/cmake/test/data/test-implementations/Deployment/CMakeLists.txt +++ b/cmake/test/data/test-implementations/Deployment/CMakeLists.txt @@ -5,7 +5,7 @@ #### # Base settings -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) cmake_policy(SET CMP0048 NEW) project(TestImplementation VERSION 1.0.0 LANGUAGES C CXX)