From a5311230808cf82e037a14059138fdf683b3633c Mon Sep 17 00:00:00 2001
From: Jonathan Reichelt Gjertsen <jonath.re@gmail.com>
Date: Wed, 26 May 2021 00:10:55 +0200
Subject: [PATCH] Prevent the literal string DEBUG from being appended to some
 messages in CMake < 3.15 (#433)

Fixes issue #422
---
 cmake/preload/toolchains/pico_arm_gcc.cmake |  2 +-
 pico_sdk_init.cmake                         | 13 +++++++++++--
 tools/FindELF2UF2.cmake                     |  4 ++--
 tools/FindPioasm.cmake                      |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/cmake/preload/toolchains/pico_arm_gcc.cmake b/cmake/preload/toolchains/pico_arm_gcc.cmake
index 533c2a9..77b94e1 100644
--- a/cmake/preload/toolchains/pico_arm_gcc.cmake
+++ b/cmake/preload/toolchains/pico_arm_gcc.cmake
@@ -12,7 +12,7 @@ if (NOT PICO_GCC_TRIPLE)
         message("PICO_GCC_TRIPLE set from environment: $ENV{PICO_GCC_TRIPLE}")
     else()
         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()
 
diff --git a/pico_sdk_init.cmake b/pico_sdk_init.cmake
index c291a50..b3e054c 100644
--- a/pico_sdk_init.cmake
+++ b/pico_sdk_init.cmake
@@ -18,6 +18,15 @@ if (NOT TARGET _pico_sdk_pre_init_marker)
         endif()
     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)
         set(PICO_SDK_PATH ${CMAKE_CURRENT_LIST_DIR})
     endif ()
@@ -49,14 +58,14 @@ if (NOT TARGET _pico_sdk_pre_init_marker)
     macro(add_sub_list_dirs var)
         foreach(LIST_DIR IN LISTS ${var})
             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})
         endforeach()
     endmacro()
 
     macro(add_sub_list_files 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})
         endforeach()
     endmacro()
diff --git a/tools/FindELF2UF2.cmake b/tools/FindELF2UF2.cmake
index b772d45..fb5dd97 100644
--- a/tools/FindELF2UF2.cmake
+++ b/tools/FindELF2UF2.cmake
@@ -22,7 +22,7 @@ if (NOT ELF2UF2_FOUND)
     set(ELF2UF2_TARGET ELF2UF2)
 
     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}
                 PREFIX elf2uf2 SOURCE_DIR ${ELF2UF2_SOURCE_DIR}
                 BINARY_DIR ${ELF2UF2_BINARY_DIR}
@@ -40,4 +40,4 @@ if (NOT ELF2UF2_FOUND)
 
     add_dependencies(${ELF2UF2_TARGET} ${ELF2UF2_BUILD_TARGET})
     set(ELF2UF2_FOUND 1)
-endif()
\ No newline at end of file
+endif()
diff --git a/tools/FindPioasm.cmake b/tools/FindPioasm.cmake
index e286944..91b9021 100644
--- a/tools/FindPioasm.cmake
+++ b/tools/FindPioasm.cmake
@@ -22,7 +22,7 @@ if (NOT Pioasm_FOUND)
     set(Pioasm_TARGET Pioasm)
 
     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}}")
         ExternalProject_Add(${PioasmBuild_TARGET}
                 PREFIX pioasm SOURCE_DIR ${PIOASM_SOURCE_DIR}