Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #2602; bumps required version to 3.16 #2617

Merged
merged 1 commit into from
Mar 26, 2024
Merged

Fixes #2602; bumps required version to 3.16 #2617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion FppTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion RPI/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion Ref/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
##
Expand Down
3 changes: 1 addition & 2 deletions cmake/API.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion cmake/FPrime.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
6 changes: 3 additions & 3 deletions cmake/deployment-CMakeLists.txt.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -75,7 +75,7 @@
# Step 1: set <OPTIONAL>
##
project(<OPTIONAL> C CXX)
cmake_minimum_required(VERSION 3.15)
cmake_minimum_required(VERSION 3.16)
# Optional: set CMake build type

##
Expand Down
2 changes: 1 addition & 1 deletion cmake/docs/sdd.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

##
Expand Down
2 changes: 1 addition & 1 deletion cmake/test/data/TestDeployment/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion cmake/test/data/test-implementations/Deployment/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Loading