Merge branch 'spo_issue11' into 'master'

Do not throw an error on empty cmake vars

Closes #11

See merge request trilinos-devops-consolidation/code/SetProgramOptions!12

Author: e10harvey

src/setprogramoptions/SetProgramOptionsCMake.py

@@ -77,11 +77,7 @@ def _fieldhandler_BASH_CMAKE(self, field):
         if field.varname in self.owner._var_formatter_cache.keys():
             output = self.owner._var_formatter_cache[field.varname].strip('"')
         else:
-            # A CMake var in a BASH command is bad.
-            msg = "Unhandled variable expansion for `{}`.".format(field.varname)
-            msg += " CMake variables are only valid in a CMake Fragment file."
-            raise ValueError(msg)
-
+            output = ""
         return output
 
     def _fieldhandler_CMAKE_FRAGMENT_ENV(self, field):

src/setprogramoptions/unittests/test_SetProgramOptionsCMake.py

@@ -237,8 +237,12 @@ def test_SetProgramOptionsCMake_gen_option_list_bash_expandvars_with_unknown_cma
         # parse a section
         self._execute_parser(parser, section)
 
-        with self.assertRaises(ValueError):
-            parser.gen_option_list(section, generator="bash")
+        option_list_actual = parser.gen_option_list(section, generator="bash")
+        option_list_expect = [
+            'cmake',
+            '-DCMAKE_CXX_FLAGS:STRING="${LDFLAGS} -foo"',
+            '-DCMAKE_CXX_FLAGS:STRING="${LDFLAGS} -foo -bar"', '-DCMAKE_F90_FLAGS:STRING=" -baz"'
+        ]
 
         print("-----[ TEST END ]------------------------------------------")