From 8114ddcad1d274fd16ef6e1a74e5a0d083242018 Mon Sep 17 00:00:00 2001 From: Fred Baksik Date: Mon, 15 Nov 2021 13:15:10 -0500 Subject: [PATCH] GHS: Continue splitting variables used by generator This makes it easier to use GHS-MULTI platform in other generators that want to use the GHS-MULTI platform and compilers. --- Modules/Platform/GHS-MULTI-Determine.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Modules/Platform/GHS-MULTI-Determine.cmake b/Modules/Platform/GHS-MULTI-Determine.cmake index 3f094db69b..15a06e1362 100644 --- a/Modules/Platform/GHS-MULTI-Determine.cmake +++ b/Modules/Platform/GHS-MULTI-Determine.cmake @@ -15,6 +15,12 @@ if(CMAKE_GENERATOR MATCHES "Green Hills MULTI") set(GHS_TARGET_PLATFORM "integrity" CACHE STRING "GHS MULTI target platform") mark_as_advanced(GHS_TARGET_PLATFORM) endif() + + # Setup MULTI project variables + set(GHS_CUSTOMIZATION "" CACHE FILEPATH "optional GHS customization") + mark_as_advanced(GHS_CUSTOMIZATION) + set(GHS_GPJ_MACROS "" CACHE STRING "optional GHS macros generated in the .gpjs for legacy reasons") + mark_as_advanced(GHS_GPJ_MACROS) endif() if(CMAKE_HOST_UNIX) @@ -63,9 +69,3 @@ if(NOT GHS_OS_DIR) endif() set(GHS_BSP_NAME "IGNORE" CACHE STRING "BSP name") - -# Setup MULTI project variables -set(GHS_CUSTOMIZATION "" CACHE FILEPATH "optional GHS customization") -mark_as_advanced(GHS_CUSTOMIZATION) -set(GHS_GPJ_MACROS "" CACHE STRING "optional GHS macros generated in the .gpjs for legacy reasons") -mark_as_advanced(GHS_GPJ_MACROS)