Fix ChibiOS Cmake build warnings (#1730)

networkfusion · web-flow · commit ac4a245f55c8 · 2020-10-12T09:52:29.000+01:00
***NO_CI***
diff --git a/CMake/ChibiOS-Contrib.CMakeLists.cmake.in b/CMake/ChibiOS-Contrib.CMakeLists.cmake.in
@@ -3,6 +3,8 @@
 # See LICENSE file in the project root for full license information.
 #
 
+cmake_minimum_required(VERSION 3.15)
+
 project(ChibiOS-Contrib-download NONE)
 
 include(ExternalProject)
diff --git a/CMake/Modules/CHIBIOS_STM32F0xx_sources.cmake b/CMake/Modules/CHIBIOS_STM32F0xx_sources.cmake
@@ -77,7 +77,9 @@ foreach(SRC_FILE ${CHIBIOS_PORT_SRCS})
 
         CMAKE_FIND_ROOT_PATH_BOTH
     )
-    # message("${SRC_FILE} >> ${CHIBIOS_F0_SRC_FILE}") # debug helper
+    if (BUILD_VERBOSE)
+        message("${SRC_FILE} >> ${CHIBIOS_F0_SRC_FILE}") # debug helper
+    endif()
     list(APPEND CHIBIOS_SOURCES ${CHIBIOS_F0_SRC_FILE})
 endforeach()
 
diff --git a/CMake/Modules/CHIBIOS_STM32F4xx_sources.cmake b/CMake/Modules/CHIBIOS_STM32F4xx_sources.cmake
@@ -86,7 +86,9 @@ foreach(SRC_FILE ${CHIBIOS_PORT_SRCS})
 
         CMAKE_FIND_ROOT_PATH_BOTH
     )
-    # message("${SRC_FILE} >> ${CHIBIOS_F4_SRC_FILE}") # debug helper
+    if (BUILD_VERBOSE)
+        message("${SRC_FILE} >> ${CHIBIOS_F4_SRC_FILE}") # debug helper
+    endif()
     list(APPEND CHIBIOS_SOURCES ${CHIBIOS_F4_SRC_FILE})
 endforeach()
 
diff --git a/CMake/Modules/CHIBIOS_STM32F7xx_sources.cmake b/CMake/Modules/CHIBIOS_STM32F7xx_sources.cmake
@@ -87,7 +87,9 @@ foreach(SRC_FILE ${CHIBIOS_PORT_SRCS})
 
         CMAKE_FIND_ROOT_PATH_BOTH
     )
-    # message("${SRC_FILE} >> ${CHIBIOS_F7_SRC_FILE}") # debug helper
+    if (BUILD_VERBOSE)
+        message("${SRC_FILE} >> ${CHIBIOS_F7_SRC_FILE}") # debug helper
+    endif()
     list(APPEND CHIBIOS_SOURCES ${CHIBIOS_F7_SRC_FILE})
 endforeach()
 
diff --git a/CMake/Modules/CHIBIOS_STM32H7xx_sources.cmake b/CMake/Modules/CHIBIOS_STM32H7xx_sources.cmake
@@ -88,7 +88,9 @@ foreach(SRC_FILE ${CHIBIOS_PORT_SRCS})
 
         CMAKE_FIND_ROOT_PATH_BOTH
     )
-    # message("${SRC_FILE} >> ${CHIBIOS_H7_SRC_FILE}") # debug helper
+    if (BUILD_VERBOSE)
+        message("${SRC_FILE} >> ${CHIBIOS_H7_SRC_FILE}") # debug helper
+    endif()
     list(APPEND CHIBIOS_SOURCES ${CHIBIOS_H7_SRC_FILE})
 endforeach()
 
diff --git a/CMake/Modules/CHIBIOS_STM32L0xx_sources.cmake b/CMake/Modules/CHIBIOS_STM32L0xx_sources.cmake
@@ -77,7 +77,9 @@ foreach(SRC_FILE ${CHIBIOS_PORT_SRCS})
 
         CMAKE_FIND_ROOT_PATH_BOTH
     )
-    # message("${SRC_FILE} >> ${CHIBIOS_L0_SRC_FILE}") # debug helper
+    if (BUILD_VERBOSE)
+        message("${SRC_FILE} >> ${CHIBIOS_L0_SRC_FILE}") # debug helper
+    endif()
     list(APPEND CHIBIOS_SOURCES ${CHIBIOS_L0_SRC_FILE})
 endforeach()
 
diff --git a/CMake/Modules/CHIBIOS_STM32L4xx_sources.cmake b/CMake/Modules/CHIBIOS_STM32L4xx_sources.cmake
@@ -86,7 +86,9 @@ foreach(SRC_FILE ${CHIBIOS_PORT_SRCS})
 
         CMAKE_FIND_ROOT_PATH_BOTH
     )
-    # message("${SRC_FILE} >> ${CHIBIOS_L4_SRC_FILE}") # debug helper
+    if (BUILD_VERBOSE)
+        message("${SRC_FILE} >> ${CHIBIOS_L4_SRC_FILE}") # debug helper
+    endif()
     list(APPEND CHIBIOS_SOURCES ${CHIBIOS_L4_SRC_FILE})
 endforeach()
 
diff --git a/CMake/Modules/FindCHIBIOS.cmake b/CMake/Modules/FindCHIBIOS.cmake
@@ -171,11 +171,13 @@ foreach(SRC_FILE ${CHIBIOS_SRCS})
 
         CMAKE_FIND_ROOT_PATH_BOTH
     )
-     #message("${SRC_FILE} >> ${CHIBIOS_SRC_FILE}") # debug helper
+    if (BUILD_VERBOSE)
+        message("${SRC_FILE} >> ${CHIBIOS_SRC_FILE}") # debug helper
+    endif()
     list(APPEND CHIBIOS_SOURCES ${CHIBIOS_SRC_FILE})
 endforeach()
 
 
 include(FindPackageHandleStandardArgs)
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(CHIBIOS DEFAULT_MSG CHIBIOS_INCLUDE_DIRS CHIBIOS_SOURCES)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ChibiOS DEFAULT_MSG CHIBIOS_INCLUDE_DIRS CHIBIOS_SOURCES)
diff --git a/CMake/Modules/FindChibiOS-Contrib.cmake b/CMake/Modules/FindChibiOS-Contrib.cmake
@@ -43,4 +43,4 @@ list(APPEND CHIBIOS_CONTRIB_SOURCES ${PROJECT_BINARY_DIR}/ChibiOS-Contrib_Source
 list(APPEND CHIBIOS_CONTRIB_SOURCES ${PROJECT_BINARY_DIR}/ChibiOS-Contrib_Source/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c)
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(CHIBIOS_CONTRIB DEFAULT_MSG CHIBIOS_CONTRIB_INCLUDE_DIRS CHIBIOS_CONTRIB_SOURCES)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ChibiOS-Contrib DEFAULT_MSG CHIBIOS_CONTRIB_INCLUDE_DIRS CHIBIOS_CONTRIB_SOURCES)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,9 @@ cmake_minimum_required(VERSION 3.15)
 include(CMakeToolsHelpers OPTIONAL)
 include(ExternalProject)
 
-set(CMAKE_VERBOSE_MAKEFILE 1)  # debug helper
+if (BUILD_VERBOSE)
+    set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "ON" FORCE) # debug helper
+endif()
 
 # the following prevents launchin a build in the source tree
 set(CMAKE_DISABLE_SOURCE_CHANGES ON)
diff --git a/targets/CMSIS-OS/ChibiOS/MBN_QUAIL/CMakeLists.txt b/targets/CMSIS-OS/ChibiOS/MBN_QUAIL/CMakeLists.txt
@@ -17,7 +17,7 @@ set(NANOBOOTER_PROJECT_NAME "nanoBooter")
 set(NANOCLR_PROJECT_NAME "nanoCLR")
 
 find_package(BuildUtils REQUIRED)
-find_package(CHIBIOS REQUIRED)
+find_package(ChibiOS REQUIRED)
 find_package(ChibiOSnfOverlay REQUIRED)
 find_package(WireProtocol REQUIRED)
 
diff --git a/targets/CMSIS-OS/ChibiOS/NETDUINO3_WIFI/CMakeLists.txt b/targets/CMSIS-OS/ChibiOS/NETDUINO3_WIFI/CMakeLists.txt
@@ -17,7 +17,7 @@ set(NANOBOOTER_PROJECT_NAME "nanoBooter")
 set(NANOCLR_PROJECT_NAME "nanoCLR")
 
 find_package(BuildUtils REQUIRED)
-find_package(CHIBIOS REQUIRED)
+find_package(ChibiOS REQUIRED)
 find_package(ChibiOSnfOverlay REQUIRED)
 find_package(WireProtocol REQUIRED)
 
diff --git a/targets/CMSIS-OS/ChibiOS/ORGPAL_PALTHREE/CMakeLists.txt b/targets/CMSIS-OS/ChibiOS/ORGPAL_PALTHREE/CMakeLists.txt
@@ -18,7 +18,7 @@ set(NANOBOOTER_PROJECT_NAME "nanoBooter")
 set(NANOCLR_PROJECT_NAME "nanoCLR")
 
 find_package(BuildUtils REQUIRED)
-find_package(CHIBIOS REQUIRED)
+find_package(ChibiOS REQUIRED)
 find_package(ChibiOSnfOverlay REQUIRED)
 find_package(WireProtocol REQUIRED)
 
@@ -44,7 +44,7 @@ endif()
 # nF feature: networking
 if(USE_NETWORKING_OPTION)
     find_package(CHIBIOS_LWIP REQUIRED)
-    find_package(NF_NETWORKING REQUIRED)
+    find_package(NF_Networking REQUIRED)
 endif()
 
 # nF feature: filesystem
diff --git a/targets/CMSIS-OS/ChibiOS/ST_NUCLEO64_F091RC/CMakeLists.txt b/targets/CMSIS-OS/ChibiOS/ST_NUCLEO64_F091RC/CMakeLists.txt
@@ -17,7 +17,7 @@ set(NANOBOOTER_PROJECT_NAME "nanoBooter")
 set(NANOCLR_PROJECT_NAME "nanoCLR")
 
 find_package(BuildUtils REQUIRED)
-find_package(CHIBIOS REQUIRED)
+find_package(ChibiOS REQUIRED)
 find_package(ChibiOSnfOverlay REQUIRED)
 find_package(WireProtocol REQUIRED)
 
diff --git a/targets/CMSIS-OS/ChibiOS/ST_STM32F429I_DISCOVERY/CMakeLists.txt b/targets/CMSIS-OS/ChibiOS/ST_STM32F429I_DISCOVERY/CMakeLists.txt
@@ -17,7 +17,7 @@ set(NANOBOOTER_PROJECT_NAME "nanoBooter")
 set(NANOCLR_PROJECT_NAME "nanoCLR")
 
 find_package(BuildUtils REQUIRED)
-find_package(CHIBIOS REQUIRED)
+find_package(ChibiOS REQUIRED)
 find_package(ChibiOSnfOverlay REQUIRED)
 find_package(WireProtocol REQUIRED)
 
diff --git a/targets/CMSIS-OS/ChibiOS/ST_STM32F769I_DISCOVERY/CMakeLists.txt b/targets/CMSIS-OS/ChibiOS/ST_STM32F769I_DISCOVERY/CMakeLists.txt
@@ -17,7 +17,7 @@ set(NANOBOOTER_PROJECT_NAME "nanoBooter")
 set(NANOCLR_PROJECT_NAME "nanoCLR")
 
 find_package(BuildUtils REQUIRED)
-find_package(CHIBIOS REQUIRED)
+find_package(ChibiOS REQUIRED)
 find_package(ChibiOSnfOverlay REQUIRED)
 find_package(WireProtocol REQUIRED)
 

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`	`# See LICENSE file in the project root for full license information.`
`4`	`4`	`#`
`5`	`5`
	`6`	`+cmake_minimum_required(VERSION 3.15)`
	`7`	`+`
`6`	`8`	`project(ChibiOS-Contrib-download NONE)`
`7`	`9`
`8`	`10`	`include(ExternalProject)`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,9 @@ foreach(SRC_FILE ${CHIBIOS_PORT_SRCS})`
`77`	`77`
`78`	`78`	`CMAKE_FIND_ROOT_PATH_BOTH`
`79`	`79`	`)`
`80`		`- # message("${SRC_FILE} >> ${CHIBIOS_F0_SRC_FILE}") # debug helper`
	`80`	`+ if (BUILD_VERBOSE)`
	`81`	`+ message("${SRC_FILE} >> ${CHIBIOS_F0_SRC_FILE}") # debug helper`
	`82`	`+ endif()`
`81`	`83`	`list(APPEND CHIBIOS_SOURCES ${CHIBIOS_F0_SRC_FILE})`
`82`	`84`	`endforeach()`
`83`	`85`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,9 @@ foreach(SRC_FILE ${CHIBIOS_PORT_SRCS})`
`86`	`86`
`87`	`87`	`CMAKE_FIND_ROOT_PATH_BOTH`
`88`	`88`	`)`
`89`		`- # message("${SRC_FILE} >> ${CHIBIOS_F4_SRC_FILE}") # debug helper`
	`89`	`+ if (BUILD_VERBOSE)`
	`90`	`+ message("${SRC_FILE} >> ${CHIBIOS_F4_SRC_FILE}") # debug helper`
	`91`	`+ endif()`
`90`	`92`	`list(APPEND CHIBIOS_SOURCES ${CHIBIOS_F4_SRC_FILE})`
`91`	`93`	`endforeach()`
`92`	`94`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,9 @@ foreach(SRC_FILE ${CHIBIOS_PORT_SRCS})`
`87`	`87`
`88`	`88`	`CMAKE_FIND_ROOT_PATH_BOTH`
`89`	`89`	`)`
`90`		`- # message("${SRC_FILE} >> ${CHIBIOS_F7_SRC_FILE}") # debug helper`
	`90`	`+ if (BUILD_VERBOSE)`
	`91`	`+ message("${SRC_FILE} >> ${CHIBIOS_F7_SRC_FILE}") # debug helper`
	`92`	`+ endif()`
`91`	`93`	`list(APPEND CHIBIOS_SOURCES ${CHIBIOS_F7_SRC_FILE})`
`92`	`94`	`endforeach()`
`93`	`95`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,9 @@ foreach(SRC_FILE ${CHIBIOS_PORT_SRCS})`
`88`	`88`
`89`	`89`	`CMAKE_FIND_ROOT_PATH_BOTH`
`90`	`90`	`)`
`91`		`- # message("${SRC_FILE} >> ${CHIBIOS_H7_SRC_FILE}") # debug helper`
	`91`	`+ if (BUILD_VERBOSE)`
	`92`	`+ message("${SRC_FILE} >> ${CHIBIOS_H7_SRC_FILE}") # debug helper`
	`93`	`+ endif()`
`92`	`94`	`list(APPEND CHIBIOS_SOURCES ${CHIBIOS_H7_SRC_FILE})`
`93`	`95`	`endforeach()`
`94`	`96`