Skip to content

Bump required CMake version and clean up a little #889

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

Open
Daft-Freak wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bump required CMake version and clean up a little #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff6eb85
Bump min CMake version to 3.12 and use FindPython
Daft-Freak Jan 20, 2025
fc8aa26
Bump min CMake version to 3.15
Daft-Freak Jan 20, 2025
44459fa
Don't bother finding readelf in the 32blit toolchain
Daft-Freak Jan 20, 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
8 changes: 4 additions & 4 deletions 32blit-config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ if (NOT DEFINED BLIT_ONCE)
set(CMAKE_CXX_EXTENSIONS OFF)
set(BLIT_MINIMUM_TOOLS_VERSION "0.7.3")

find_package(PythonInterp 3.6 REQUIRED)
find_package(Python 3.6 REQUIRED)

# make sure that the tools are installed
execute_process(COMMAND ${PYTHON_EXECUTABLE} -m ttblit version RESULT_VARIABLE VERSION_STATUS OUTPUT_VARIABLE TOOLS_VERSION ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND ${Python_EXECUTABLE} -m ttblit version RESULT_VARIABLE VERSION_STATUS OUTPUT_VARIABLE TOOLS_VERSION ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)

if(${VERSION_STATUS})
# check for the executable if the module isn't found
Expand All @@ -18,11 +18,11 @@ if (NOT DEFINED BLIT_ONCE)
execute_process(COMMAND ${32BLIT_TOOLS_EXECUTABLE} version RESULT_VARIABLE VERSION_STATUS OUTPUT_VARIABLE TOOLS_VERSION ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
else()
set(32BLIT_TOOLS_EXECUTABLE ${PYTHON_EXECUTABLE} -m ttblit)
set(32BLIT_TOOLS_EXECUTABLE ${Python_EXECUTABLE} -m ttblit)
endif()

# get just the python command to output to the user
get_filename_component(PYTHON_USER_EXECUTABLE "${PYTHON_EXECUTABLE}" NAME)
get_filename_component(PYTHON_USER_EXECUTABLE "${Python_EXECUTABLE}" NAME)

if(${VERSION_STATUS})
message(FATAL_ERROR "32Blit tools not found!\nInstall with: ${PYTHON_USER_EXECUTABLE} -m pip install 32blit\n")
Expand Down
14 changes: 2 additions & 12 deletions 32blit-stm32/executable.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,7 @@ function(blit_executable NAME)

add_executable(${NAME} ${USER_STARTUP} ${SOURCES})

# Ideally we want the .blit filename to match the .elf, but TARGET_FILE_BASE_NAME isn't always available
# (This only affects the firmware updater as it's the only thing setting a custom OUTPUT_NAME)
if(${CMAKE_VERSION} VERSION_LESS "3.15.0")
set(BLIT_FILENAME ${NAME}.blit)
else()
set(BLIT_FILENAME $<TARGET_FILE_BASE_NAME:${NAME}>.blit)
endif()
set(BLIT_FILENAME $<TARGET_FILE_BASE_NAME:${NAME}>.blit)

install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BLIT_FILENAME}
DESTINATION bin
Expand Down Expand Up @@ -80,11 +74,7 @@ function(blit_metadata TARGET FILE)

include(${CMAKE_CURRENT_BINARY_DIR}/metadata.cmake)

if(${CMAKE_VERSION} VERSION_LESS "3.15.0")
set(BLIT_FILENAME ${TARGET}.blit)
else()
set(BLIT_FILENAME $<TARGET_FILE_BASE_NAME:${TARGET}>.blit)
endif()
set(BLIT_FILENAME $<TARGET_FILE_BASE_NAME:${TARGET}>.blit)

add_custom_command(
TARGET ${TARGET} POST_BUILD
Expand Down
2 changes: 1 addition & 1 deletion 32blit-stm32/firmware/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.9...3.26)
cmake_minimum_required(VERSION 3.15...3.31)
project (firmware)
find_package (32BLIT CONFIG REQUIRED PATHS ..)

Expand Down
1 change: 0 additions & 1 deletion 32blit.toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ set(CMAKE_C_COMPILER arm-none-eabi-gcc CACHE PATH "Path to C compiler")
set(CMAKE_CXX_COMPILER arm-none-eabi-g++ CACHE PATH "Path to C++ compiler")

find_program(CMAKE_SIZE NAMES arm-none-eabi-size)
find_program(CMAKE_READELF NAMES arm-none-eabi-readelf) # handled by CMake in 3.16+

set(MCU_LINKER_SCRIPT STM32H750VBTx.ld)
set(MCU_LINKER_FLAGS_INT -Wl,--defsym=FLASH_TARGET_INT=1)
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.9...3.26)
cmake_minimum_required(VERSION 3.15...3.31)

# has to be before project
include(32blit-pico/sdk_import.cmake)
Expand Down
2 changes: 1 addition & 1 deletion launcher/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.9...3.26)
cmake_minimum_required(VERSION 3.15...3.31)
project (launcher)
find_package (32BLIT CONFIG REQUIRED PATHS ..)

Expand Down
2 changes: 1 addition & 1 deletion utilities/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.9...3.26)
cmake_minimum_required(VERSION 3.15...3.31)
project (examples)
find_package (32BLIT CONFIG REQUIRED PATHS ..)

Expand Down
2 changes: 1 addition & 1 deletion utilities/hardware-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.9...3.26)
cmake_minimum_required(VERSION 3.15...3.31)
project (hardware-test)
find_package (32BLIT CONFIG REQUIRED PATHS ../..)

Expand Down
2 changes: 1 addition & 1 deletion utilities/picosystem-hardware-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.9...3.26)
cmake_minimum_required(VERSION 3.15...3.31)
project (picosystem-hardware-test)
find_package (32BLIT CONFIG REQUIRED PATHS ../..)

Expand Down
Loading