diff options
| author | Fred Baksik <fdk17@ftml.net> | 2021-11-15 18:15:10 (GMT) |
|---|---|---|
| committer | Fred Baksik <fdk17@ftml.net> | 2021-11-15 18:15:10 (GMT) |
| commit | 83eb5695e9540d18d7ff40a369763036813da79b (patch) | |
| tree | 75970779fe78d827dc7a5c672707adaef49cf5c9 /Modules/Platform | |
| parent | 8114ddcad1d274fd16ef6e1a74e5a0d083242018 (diff) | |
| download | CMake-83eb5695e9540d18d7ff40a369763036813da79b.zip CMake-83eb5695e9540d18d7ff40a369763036813da79b.tar.gz CMake-83eb5695e9540d18d7ff40a369763036813da79b.tar.bz2 | |
GHS: Update toolset selection logic
-- Ensure that GHS_TOOLSET_ROOT is used as a path
* Converts directory path slashes to CMake style
-- Use ComparePath() to properly check for path changes of build tool
* Accounts for Windows file-system case insensitivity.
-- Don't print message "defaulting" messages (this causes CMake test failures)
-- Don't force update CMAKE_GENERATOR_TOOLSET back into cache when `-T`
is not used on initial configure. This change avoids an unnessary
error message when accidentally using `-T` in subsequent runs but the same
tools are always used.
-- Use IssueMessage() for error messages.
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/GHS-MULTI-Determine.cmake | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Modules/Platform/GHS-MULTI-Determine.cmake b/Modules/Platform/GHS-MULTI-Determine.cmake index 15a06e1..0a6a3b1 100644 --- a/Modules/Platform/GHS-MULTI-Determine.cmake +++ b/Modules/Platform/GHS-MULTI-Determine.cmake @@ -16,6 +16,16 @@ if(CMAKE_GENERATOR MATCHES "Green Hills MULTI") mark_as_advanced(GHS_TARGET_PLATFORM) endif() + # Setup MULTI toolset selection variables + if(CMAKE_HOST_UNIX) + set(_ts_root "/usr/ghs") + else() + set(_ts_root "C:/ghs") + endif() + set(GHS_TOOLSET_ROOT "${_ts_root}" CACHE PATH "GHS platform toolset root directory") + mark_as_advanced(GHS_TOOLSET_ROOT) + unset(_ts_root) + # Setup MULTI project variables set(GHS_CUSTOMIZATION "" CACHE FILEPATH "optional GHS customization") mark_as_advanced(GHS_CUSTOMIZATION) |