expand variable in 'Other CMake arguments' setting

Fix #207
15knots · Feb 11, 2025 · 2050d0b · 2050d0b
1 parent 68225a7
commit 2050d0b
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/...ke4eclipse.mbs/src/main/java/de/marw/cmake4eclipse/mbs/internal/BuildscriptGenerator.java b/...ke4eclipse.mbs/src/main/java/de/marw/cmake4eclipse/mbs/internal/BuildscriptGenerator.java
@@ -563,10 +563,16 @@ private List<String> buildCommandline(IPath srcDir, Optional<BuildToolKitDefinit
       /* user specified other cmake arguments.. */
       String otherArguments = prefs.getOtherArguments();
       if (otherArguments != null) {
+        final ICdtVariableManager mngr = CCorePlugin.getDefault().getCdtVariableManager();
         // handle Unix shell quoting
-        QuotedStringTokenizer tokenizer = QuotedStringTokenizer.builder().delimiters( " \t\n\r\f").build();
+        QuotedStringTokenizer tokenizer = QuotedStringTokenizer.builder().delimiters(" \t\n\r\f").build();
         for (Iterator<String> iter = tokenizer.tokenize(otherArguments); iter.hasNext();) {
-          args.add(iter.next());
+          final String arg = iter.next();
+          try {
+            args.add(mngr.resolveValue(arg, null, "", cfgd));
+          } catch (CdtVariableException ex) {
+            args.add(arg);
+          }
         }
       }
     }