Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

STAB3: fix cmake build for ST4 or ST3 #1086

Merged
merged 3 commits into from
Oct 10, 2023
Merged

STAB3: fix cmake build for ST4 or ST3 #1086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f220b5e
switches.json: attribute fix, requires --> requires_any
MatthewMasarik-NOAA Sep 26, 2023
de7cfb7
check_switches.cmake: fix 2 typos
MatthewMasarik-NOAA Sep 26, 2023
8850396
Merge branch 'NOAA-EMC:develop' into bugfix/stab3
MatthewMasarik-NOAA Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions model/src/cmake/check_switches.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function(check_switches switches switch_files)
message(FATAL_ERROR "Switch '${valid_opt}' requires '${required_switch}' to be set")
endif()
elseif(json_type STREQUAL "ARRAY")
string(JSON n_requires_any LENGTH ${vategory} valid-options ${j_options} requries ${i_requires})
string(JSON n_requires_any LENGTH ${category} valid-options ${j_options} requires ${i_requires})
math(EXPR n_requires_any "${n_requires_any} - 1")

# Loop over array and check that one of the switches is present
Expand All @@ -70,7 +70,7 @@ function(check_switches switches switch_files)
if(NOT found)
message(FATAL_ERROR "Switch ${valid_opt} requires one of ${possible_values} to be set")
endif()

endif()
endforeach()
endif()
Expand Down Expand Up @@ -98,7 +98,7 @@ function(check_switches switches switch_files)
elseif(num_switches STREQUAL "upto2" AND n_switches_in_category GREATER 2)
message(FATAL_ERROR "Too many ${category_name} switches found (max 2)")
endif()

endforeach()

set(${switch_files} ${files} PARENT_SCOPE)
Expand Down
12 changes: 6 additions & 6 deletions model/src/cmake/switches.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
},
{
"name": "STAB3",
"requires": ["ST3", "ST4"]
"requires_any": ["ST3", "ST4"]
}
]
},
Expand Down Expand Up @@ -756,16 +756,16 @@
}
]
},
{
"name": "ddlib",
{
"name": "ddlib",
"num_switches": "upto1",
"description": "domain decomposition library",
"valid-options": [
{
{
"name": "METIS",
"requires": ["PDLIB"]
},
{
},
{
"name": "SCOTCH",
"requires": ["PDLIB"]
}
Expand Down