Fix import, update more CMakeLists.txt files

Author: multiplemonomials

CMakeLists.txt

@@ -56,7 +56,14 @@ if(MBED_IS_STANDALONE AND NOT MBED_IS_NATIVE_BUILD)
     set(MBED_CONFIG_PATH ${CMAKE_CURRENT_BINARY_DIR} CACHE STRING "")
 
     # Initialize Mbed build system
-    include(${CMAKE_CURRENT_LIST_DIR}/tools/cmake/app.cmake)
+    include(${CMAKE_CURRENT_LIST_DIR}/tools/cmake/mbed_toolchain_setup.cmake)
+endif()
+
+# Create project and find compilers (if not already found)
+project(mbed-os LANGUAGES C CXX ASM)
+
+if(MBED_IS_STANDALONE AND NOT MBED_IS_NATIVE_BUILD)
+    include(mbed_project_setup)
 endif()
 
 if(MBED_IS_NATIVE_BUILD)
@@ -85,9 +92,6 @@ endif()
 
 # Create core Mbed OS targets and set up build flags  ----------------------------------------------------------------------------------
 
-# Create project and find compilers (if not already found)
-project(mbed-os LANGUAGES C CXX ASM)
-
 # Add all paths to the module files within Mbed OS
 list(APPEND CMAKE_MODULE_PATH
     ${mbed-os_SOURCE_DIR}/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/scripts
@@ -291,19 +295,3 @@ if(NOT MBED_IS_NATIVE_BUILD)
     mbed_extract_flags(${MBED_TARGET_CMAKE_NAME}-flags ${MBED_TARGET_CMAKE_NAME})
     target_link_libraries(mbed-core-flags INTERFACE ${MBED_TARGET_CMAKE_NAME}-flags)
 endif()
-
-# Ninja requires to be forced for response files
-if ("${CMAKE_GENERATOR}" MATCHES "Ninja")
-    # known issue ARMClang and Ninja with response files for windows
-    # https://gitlab.kitware.com/cmake/cmake/-/issues/21093
-    # This gets fixed in newer cmake version
-    # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6484
-    if((CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") AND ((${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.22.0") OR (NOT CMAKE_CXX_COMPILER_ID MATCHES "ARMClang")))
-        set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1 CACHE INTERNAL "")
-    endif()
-endif()
-
-# If this is the top-level buildscript, run finalize tasks
-if(MBED_IS_STANDALONE AND (NOT MBED_IS_NATIVE_BUILD))
-    mbed_finalize_build()
-endif()

tools/cmake/app.cmake

@@ -1,7 +1,7 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-message(WARNING "Mbed: Deprecated: Instead of including app.cmake, include mbed_toolchain_setup.cmake, then call project(), then include mbed_project_setup.cmake. Including app.cmake will unavoidably trigger a warning from CMake due to calling enable_language() before project().")
+message(WARNING "Mbed: Deprecated: Instead of including app.cmake, include mbed_toolchain_setup.cmake, then call project(), then include mbed_project_setup.cmake. For more info, see https://github.com/mbed-ce/mbed-os/pull/421")
 
 include(${CMAKE_CURRENT_LIST_DIR}/mbed_toolchain_setup.cmake)
 

tools/cmake/tests/mbed_test_mode/CMakeLists.txt

@@ -5,11 +5,12 @@ cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
 
 set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../.. CACHE INTERNAL "")
 
-include(${MBED_PATH}/tools/cmake/app.cmake)
+include(${MBED_PATH}/tools/cmake/mbed_toolchain_setup.cmake)
+project(mbed-test-mode-check)
+include(mbed_project_setup)
 
 add_test(NAME mbed-test-mode-check COMMAND mbed-test-mode-check)
 add_executable(mbed-test-mode-check)
-project(mbed-test-mode-check)
 
 set(PROJECT_NAME ${CMAKE_PROJECT_NAME} CACHE INTERNAL "")
 include(CTest)

tools/cmake/tests/multiple_executables/CMakeLists.txt

@@ -5,9 +5,9 @@ cmake_minimum_required(VERSION 3.19.0)
 
 set(MBED_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
 
-include("${MBED_PATH}/tools/cmake/app.cmake")
-
+include(${MBED_PATH}/tools/cmake/mbed_toolchain_setup.cmake)
 project(multiple_executables)
+include(mbed_project_setup)
 
 add_subdirectory("${MBED_PATH}" "mbed-os-build")
 

tools/python/memap/memap.py

@@ -61,7 +61,7 @@
 from argparse import ArgumentParser
 from copy import deepcopy
 from collections import defaultdict
-from prettytable import PrettyTable, HRuleStyle
+from prettytable import PrettyTable
 
 # prettytable moved this constant into an enum in the Python 3.9 release.
 if sys.version_info >= (3, 9):