From e572c84b68bc6ae58a11621b8026cc9ff115ff16 Mon Sep 17 00:00:00 2001 From: Michael D Starch Date: Thu, 7 Dec 2023 11:58:08 -0800 Subject: [PATCH 1/2] Fixing improper unsetting of CMake variables --- cmake/API.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/API.cmake b/cmake/API.cmake index 824fb6a892..ee55e23642 100644 --- a/cmake/API.cmake +++ b/cmake/API.cmake @@ -98,8 +98,9 @@ function(add_fprime_subdirectory FP_SOURCE_DIR) set(FPRIME_CURRENT_MODULE "${MODULE_NAME}") # Unset all variables that carry special meaning as it is dangerous to pass them through - init_variables(SOURCE_FILES MOD_DEPS UT_SOURCE_FILES UT_MOD_DEPS EXECUTABLE_NAME) - + foreach (VARIABLE IN ITEMS SOURCE_FILES MOD_DEPS UT_SOURCE_FILES UT_MOD_DEPS EXECUTABLE_NAME) + set(${VARIABLE} PARENT_SCOPE) + endforeach() # Check if the binary and source directory are in agreement. If they agree, then normally add # the directory, as no adjustments need be made. From c968928f2f6215bbccfbd18ff894fe20e5b212bf Mon Sep 17 00:00:00 2001 From: Michael D Starch Date: Thu, 7 Dec 2023 11:58:23 -0800 Subject: [PATCH 2/2] Fixing improper user of CMAKE_SYSTEM_NAME --- cmake/API.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/API.cmake b/cmake/API.cmake index ee55e23642..5d2c5e2380 100644 --- a/cmake/API.cmake +++ b/cmake/API.cmake @@ -31,9 +31,9 @@ set(FPRIME_AUTOCODER_TARGET_LIST "" CACHE INTERNAL "FPRIME_AUTOCODER_TARGET_LIST ##### macro(restrict_platforms) set(__CHECKER ${ARGN}) - if (NOT FPRIME_TOOLCHAIN_NAME IN_LIST __CHECKER AND NOT CMAKE_SYSTEM_NAME IN_LIST __CHECKER) + if (NOT FPRIME_TOOLCHAIN_NAME IN_LIST __CHECKER AND NOT FPRIME_PLATFORM IN_LIST __CHECKER) get_module_name("${CMAKE_CURRENT_LIST_DIR}") - message(STATUS "Neither toolchain ${FPRIME_TOOLCHAIN_NAME} nor platform ${CMAKE_SYSTEM_NAME} supported for module ${MODULE_NAME}") + message(STATUS "Neither toolchain ${FPRIME_TOOLCHAIN_NAME} nor platform ${FPRIME_PLATFORM} supported for module ${MODULE_NAME}") return() endif() endmacro()