diff options
| author | Fred Baksik <frodak17@gmail.com> | 2019-01-05 16:01:19 (GMT) |
|---|---|---|
| committer | Fred Baksik <frodak17@gmail.com> | 2019-01-16 15:40:59 (GMT) |
| commit | a42e40e78dc3d9c4289a3c9640cae94ecd034373 (patch) | |
| tree | 051b935f357748acf38b255431fdf7610fe0c19c /Modules | |
| parent | c59eae7ebc5423c2b06befd762f8639b0f23b7a0 (diff) | |
| download | CMake-a42e40e78dc3d9c4289a3c9640cae94ecd034373.zip CMake-a42e40e78dc3d9c4289a3c9640cae94ecd034373.tar.gz CMake-a42e40e78dc3d9c4289a3c9640cae94ecd034373.tar.bz2 | |
GHS: Only print bsp and os directives if specified by user
-- standalone platforms will not build if bsp/os is specified in project file
-- integrity platforms will always print these directives because they are required
-- cleanup -os_dir setting
allow customization of the actual setting because it is determined by tool-set customization files
remove variable that was set but never used
-- add message when using default values
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/GHS-MULTI-Initialize.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Modules/Platform/GHS-MULTI-Initialize.cmake b/Modules/Platform/GHS-MULTI-Initialize.cmake index 9b384df..25004c6 100644 --- a/Modules/Platform/GHS-MULTI-Initialize.cmake +++ b/Modules/Platform/GHS-MULTI-Initialize.cmake @@ -9,6 +9,9 @@ mark_as_advanced(GHS_OS_ROOT) set(GHS_OS_DIR "NOTFOUND" CACHE PATH "GHS platform OS directory") mark_as_advanced(GHS_OS_DIR) +set(GHS_OS_DIR_OPTION "-os_dir " CACHE STRING "GHS compiler os option") +mark_as_advanced(GHS_OS_DIR) + #set GHS_OS_DIR if not set by user if ( NOT GHS_OS_DIR ) if (EXISTS ${GHS_OS_ROOT}) @@ -23,8 +26,11 @@ if ( NOT GHS_OS_DIR ) endif () #filter based on platform name - if (GHS_TARGET_PLATFORM STREQUAL "integrity") + if (GHS_TARGET_PLATFORM MATCHES "integrity") list(FILTER GHS_CANDIDATE_OS_DIRS INCLUDE REGEX "int[0-9][0-9][0-9][0-9a-z].*") + else() #fall-back for standalone + unset(GHS_CANDIDATE_OS_DIRS) + set(GHS_OS_DIR "IGNORE") endif () if (GHS_CANDIDATE_OS_DIRS) |