abawo/pico-sdk
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent the literal string DEBUG from being appended to some messages in CMake < 3.15 (#433)

Browse Source 
Fixes issue #422
This commit is contained in:
Jonathan Reichelt Gjertsen 2021-05-26 00:10:55 +02:00 committed by GitHub
parent 6994a3858d
commit a531123080
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/preload/toolchains/pico_arm_gcc.cmake
View File

@ -12,7 +12,7 @@ if (NOT PICO_GCC_TRIPLE)
message("PICO_GCC_TRIPLE set from environment: $ENV{PICO_GCC_TRIPLE}") message("PICO_GCC_TRIPLE set from environment: $ENV{PICO_GCC_TRIPLE}")
else() else()
set(PICO_GCC_TRIPLE arm-none-eabi) set(PICO_GCC_TRIPLE arm-none-eabi)
message(DEBUG "PICO_GCC_TRIPLE defaulted to arm-none-eabi") pico_message_debug("PICO_GCC_TRIPLE defaulted to arm-none-eabi")
endif() endif()
endif() endif()

13
pico_sdk_init.cmake
View File

@ -18,6 +18,15 @@ if (NOT TARGET _pico_sdk_pre_init_marker)
endif() endif()
endfunction() endfunction()
function(pico_message_debug MESSAGE)
# The log-level system was added in CMake 3.15.
if(${CMAKE_VERSION} VERSION_LESS "3.15.0")
message(${MESSAGE})
else()
message(DEBUG ${MESSAGE})
endif()
endfunction()
if (NOT PICO_SDK_PATH) if (NOT PICO_SDK_PATH)
set(PICO_SDK_PATH ${CMAKE_CURRENT_LIST_DIR}) set(PICO_SDK_PATH ${CMAKE_CURRENT_LIST_DIR})
endif () endif ()
@ -49,14 +58,14 @@ if (NOT TARGET _pico_sdk_pre_init_marker)
macro(add_sub_list_dirs var) macro(add_sub_list_dirs var)
foreach(LIST_DIR IN LISTS ${var}) foreach(LIST_DIR IN LISTS ${var})
get_filename_component(SHORT_NAME "${LIST_DIR}" NAME) get_filename_component(SHORT_NAME "${LIST_DIR}" NAME)
message(DEBUG "Including custom CMakeLists.txt ${SHORT_NAME}") pico_message_debug("Including custom CMakeLists.txt ${SHORT_NAME}")
add_subdirectory(${LIST_DIR} ${SHORT_NAME}) add_subdirectory(${LIST_DIR} ${SHORT_NAME})
endforeach() endforeach()
endmacro() endmacro()
macro(add_sub_list_files var) macro(add_sub_list_files var)
foreach(LIST_FILE IN LISTS ${var}) foreach(LIST_FILE IN LISTS ${var})
message(DEBUG "Including custom CMake file ${LIST_FILE}") pico_message_debug("Including custom CMake file ${LIST_FILE}")
include(${LIST_FILE}) include(${LIST_FILE})
endforeach() endforeach()
endmacro() endmacro()

4
tools/FindELF2UF2.cmake
View File

@ -22,7 +22,7 @@ if (NOT ELF2UF2_FOUND)
set(ELF2UF2_TARGET ELF2UF2) set(ELF2UF2_TARGET ELF2UF2)
if (NOT TARGET ${ELF2UF2_BUILD_TARGET}) if (NOT TARGET ${ELF2UF2_BUILD_TARGET})
message(DEBUG "ELF2UF2 will need to be built") pico_message_debug("ELF2UF2 will need to be built")
ExternalProject_Add(${ELF2UF2_BUILD_TARGET} ExternalProject_Add(${ELF2UF2_BUILD_TARGET}
PREFIX elf2uf2 SOURCE_DIR ${ELF2UF2_SOURCE_DIR} PREFIX elf2uf2 SOURCE_DIR ${ELF2UF2_SOURCE_DIR}
BINARY_DIR ${ELF2UF2_BINARY_DIR} BINARY_DIR ${ELF2UF2_BINARY_DIR}
@ -40,4 +40,4 @@ if (NOT ELF2UF2_FOUND)
add_dependencies(${ELF2UF2_TARGET} ${ELF2UF2_BUILD_TARGET}) add_dependencies(${ELF2UF2_TARGET} ${ELF2UF2_BUILD_TARGET})
set(ELF2UF2_FOUND 1) set(ELF2UF2_FOUND 1)
endif() endif()

2
tools/FindPioasm.cmake
View File

@ -22,7 +22,7 @@ if (NOT Pioasm_FOUND)
set(Pioasm_TARGET Pioasm) set(Pioasm_TARGET Pioasm)
if (NOT TARGET ${PioasmBuild_TARGET}) if (NOT TARGET ${PioasmBuild_TARGET})
message(DEBUG "PIOASM will need to be built") pico_message_debug("PIOASM will need to be built")
# message("Adding external project ${PioasmBuild_Target} in ${CMAKE_CURRENT_LIST_DIR}}") # message("Adding external project ${PioasmBuild_Target} in ${CMAKE_CURRENT_LIST_DIR}}")
ExternalProject_Add(${PioasmBuild_TARGET} ExternalProject_Add(${PioasmBuild_TARGET}
PREFIX pioasm SOURCE_DIR ${PIOASM_SOURCE_DIR} PREFIX pioasm SOURCE_DIR ${PIOASM_SOURCE_DIR}