summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Baksik <fdk17@ftml.net>2021-11-15 18:15:10 (GMT)
committerFred Baksik <fdk17@ftml.net>2021-11-15 18:15:10 (GMT)
commit8114ddcad1d274fd16ef6e1a74e5a0d083242018 (patch)
tree38c7438d2d7016ced35baeaad0538787f038c457
parent831607889f6d197bba260fc604cd5df992d248b0 (diff)
downloadCMake-8114ddcad1d274fd16ef6e1a74e5a0d083242018.zip
CMake-8114ddcad1d274fd16ef6e1a74e5a0d083242018.tar.gz
CMake-8114ddcad1d274fd16ef6e1a74e5a0d083242018.tar.bz2
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.
-rw-r--r--Modules/Platform/GHS-MULTI-Determine.cmake12
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/Platform/GHS-MULTI-Determine.cmake b/Modules/Platform/GHS-MULTI-Determine.cmake
index 3f094db..15a06e1 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)