Skip to content

Bump minimum CMake version #53

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

Merged
lsf37 merged 2 commits into from
Aug 15, 2025
Merged

Bump minimum CMake version #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e482500
Bump minimum CMake version
lsf37 Aug 14, 2025
4b24148
trivial: update style to new cmake-format
lsf37 Aug 14, 2025
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
15 changes: 9 additions & 6 deletions Findglobal-components.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@
# SPDX-License-Identifier: BSD-2-Clause
#

set(GLOBAL_COMPONENTS_DIR "${CMAKE_CURRENT_LIST_DIR}" CACHE STRING "")
set(GLOBAL_COMPONENTS_PATH "${CMAKE_CURRENT_LIST_DIR}/global-components.cmake" CACHE STRING "")
set(GLOBAL_COMPONENTS_DIR
"${CMAKE_CURRENT_LIST_DIR}"
CACHE STRING ""
)
set(GLOBAL_COMPONENTS_PATH
"${CMAKE_CURRENT_LIST_DIR}/global-components.cmake"
CACHE STRING ""
)
mark_as_advanced(GLOBAL_COMPONENTS_DIR GLOBAL_COMPONENTS_PATH)

macro(global_components_import_project)
Expand All @@ -14,8 +20,5 @@ endmacro()

include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(
global-components
DEFAULT_MSG
GLOBAL_COMPONENTS_DIR
GLOBAL_COMPONENTS_PATH
global-components DEFAULT_MSG GLOBAL_COMPONENTS_DIR GLOBAL_COMPONENTS_PATH
)
2 changes: 1 addition & 1 deletion components/BenchUtiliz/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

CAmkESAddImportPath(camkes-include)
CAmkESAddCPPInclude(camkes-include)
Expand Down
2 changes: 1 addition & 1 deletion components/ClockServer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(ClockServer C)

Expand Down
2 changes: 1 addition & 1 deletion components/ClockServer/libClockServer-client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(libClockServer-client C)

Expand Down
12 changes: 10 additions & 2 deletions components/Ethdriver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,21 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(Ethdriver C)

CAmkESAddCPPInclude("${CMAKE_CURRENT_LIST_DIR}/include/plat/${KernelPlatform}/")

set(ETHDRIVER_LIBS sel4utils sel4vka sel4allocman sel4vspace sel4simple sel4platsupport ethdrivers)
set(ETHDRIVER_LIBS
sel4utils
sel4vka
sel4allocman
sel4vspace
sel4simple
sel4platsupport
ethdrivers
)

DeclareCAmkESComponent(
Ethdriver82574
Expand Down
2 changes: 1 addition & 1 deletion components/FileServer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(FileServer C)

Expand Down
2 changes: 1 addition & 1 deletion components/FileServer/libFileServer-client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(libFileServer-client C)

Expand Down
2 changes: 1 addition & 1 deletion components/GPIOMUXServer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(GPIOMUXServer C)

Expand Down
2 changes: 1 addition & 1 deletion components/GPIOMUXServer/libGPIOMUXServer-client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(libGPIOMUXServer-client C)

Expand Down
2 changes: 1 addition & 1 deletion components/PCIConfigIO/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(PCIConfigIO C)

Expand Down
2 changes: 1 addition & 1 deletion components/PicoServer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(PicoServer C)

Expand Down
2 changes: 1 addition & 1 deletion components/RTC/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(RTC C)

Expand Down
2 changes: 1 addition & 1 deletion components/ResetServer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(ResetServer C)

Expand Down
2 changes: 1 addition & 1 deletion components/ResetServer/libResetServer-client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(libResetServer-client C)

Expand Down
12 changes: 9 additions & 3 deletions components/SerialServer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,21 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(SerialServer C)

if(KernelArchARM)
set(CAmkESDTS ON CACHE BOOL "" FORCE)
set(CAmkESDTS
ON
CACHE BOOL "" FORCE
)
endif()

set(CAmkESCPP ON CACHE BOOL "" FORCE)
set(CAmkESCPP
ON
CACHE BOOL "" FORCE
)

# ARM platforms have similar serial configurations in their DTSes and can share
# similar headers and code
Expand Down
8 changes: 2 additions & 6 deletions components/SerialServer/camkes-putchar-client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(SerialServer-camkes-putchar-client C)

Expand All @@ -13,9 +13,5 @@ CAmkESAddCPPInclude(camkes-include)
CAmkESAddTemplatesPath(templates)

DeclareCAmkESConnector(
SerialServerCamkesPutcharClient
FROM
SerialServer-camkes-putchar-client.template.c
TO
empty.c
SerialServerCamkesPutcharClient FROM SerialServer-camkes-putchar-client.template.c TO empty.c
)
12 changes: 9 additions & 3 deletions components/TimeServer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,20 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(TimeServer C)

if(KernelArchARM)
set(CAmkESDTS ON CACHE BOOL "" FORCE)
set(CAmkESDTS
ON
CACHE BOOL "" FORCE
)
endif()
set(CAmkESCPP ON CACHE BOOL "" FORCE)
set(CAmkESCPP
ON
CACHE BOOL "" FORCE
)

if("${KernelPlatform}" STREQUAL "pc99")
list(APPEND TimeServerPlatSources src/plat/pc99/plat.c)
Expand Down
2 changes: 1 addition & 1 deletion components/VirtQueue/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(VirtQueue C)

Expand Down
2 changes: 1 addition & 1 deletion components/modules/dynamic-untyped-allocators/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(dynamic-untyped-allocators-package C)

Expand Down
2 changes: 1 addition & 1 deletion components/modules/fdt-bind-driver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(fdt-bind-driver C)

Expand Down
12 changes: 10 additions & 2 deletions components/modules/picotcp-base/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,23 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(picotcp-base-package C)

CAmkESAddImportPath(camkes-include)
CAmkESAddCPPInclude(camkes-include)
CAmkESAddTemplatesPath(templates)

DeclareCAmkESConnector(PicotcpBaseInit FROM pico-init.template.c FROM_LIBS picotcp-init TO empty.c)
DeclareCAmkESConnector(
PicotcpBaseInit
FROM
pico-init.template.c
FROM_LIBS
picotcp-init
TO
empty.c
)

add_library(picotcp-init EXCLUDE_FROM_ALL picotcp-init.c)
target_link_libraries(picotcp-init sel4camkes picotcp)
2 changes: 1 addition & 1 deletion components/modules/single-threaded/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(single-threaded C)

Expand Down
2 changes: 1 addition & 1 deletion components/modules/x86-iospace-dma/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

project(dynamic-untyped-allocators-package C)

Expand Down
50 changes: 23 additions & 27 deletions global-components.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,44 +4,40 @@
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)

include("${CMAKE_CURRENT_LIST_DIR}/global-connectors.cmake")

CAmkESAddImportPath(components plat_components/${KernelPlatform})

foreach(
comp
IN
ITEMS
remote-drivers/picotcp-ethernet-async
remote-drivers/picotcp-socket-sync
components/modules/fdt-bind-driver
components/modules/dynamic-untyped-allocators
components/modules/single-threaded
components/modules/x86-iospace-dma
components/modules/picotcp-base
components/ClockServer
components/GPIOMUXServer
components/ResetServer
plat_components/tx2/BPMPServer
comp IN
ITEMS remote-drivers/picotcp-ethernet-async
remote-drivers/picotcp-socket-sync
components/modules/fdt-bind-driver
components/modules/dynamic-untyped-allocators
components/modules/single-threaded
components/modules/x86-iospace-dma
components/modules/picotcp-base
components/ClockServer
components/GPIOMUXServer
components/ResetServer
plat_components/tx2/BPMPServer
)
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/${comp}" ${comp})
endforeach()

foreach(
comp
IN
ITEMS
PCIConfigIO
RTC
SerialServer
TimeServer
FileServer
VirtQueue
BenchUtiliz
Ethdriver
PicoServer
comp IN
ITEMS PCIConfigIO
RTC
SerialServer
TimeServer
FileServer
VirtQueue
BenchUtiliz
Ethdriver
PicoServer
)
include("${CMAKE_CURRENT_LIST_DIR}/components/${comp}/CMakeLists.txt")
endforeach()
Loading