Browse Source

Fix add extra flags macro

Fix add extra flags macro
c6799a76432fa0f6035f00438e89ed62b7923c3c
dimdim11 9 months ago
parent
commit
c677f60f73
1 changed files with 9 additions and 2 deletions
  1. 9 2
      build/ymake.core.conf

+ 9 - 2
build/ymake.core.conf

@@ -3014,7 +3014,14 @@ macro SET_COMPILE_OUTPUTS_MODIFIERS(NOREL?";norel":"") {
 ### @usage: _ADD_EXTRA_FLAGS_IMPL([GENERATE] Args...) # internal
 ### Generate prefix = " && set_property SOURCE ${input:SRC} APPEND PROPERTY COMPILE_OPTIONS " before $Args when GENERATE
 ### is specified in the list of actual arguments
-macro _ADD_EXTRA_FLAGS_IMPL(GENERATE?" && set_property SOURCE ${input:SRC} APPEND PROPERTY COMPILE_OPTIONS && target_commands-ITEM && target_commands-macro set_property && target_commands-args SOURCE ${input:SRC} APPEND PROPERTY COMPILE_OPTIONS ":"", Args...) {
+macro _ADD_EXTRA_FLAGS_IMPL(GENERATE?" && set_property SOURCE ${input:SRC} APPEND PROPERTY COMPILE_OPTIONS ":"", Args...) {
+    .SEM=$GENERATE $Args
+}
+
+### @usage: _ADD_EXTRA_FLAGS_IMPL2([GENERATE] Args...) # internal
+### Generate prefix with specific semantics before $Args when GENERATE
+### is specified in the list of actual arguments
+macro _ADD_EXTRA_FLAGS_IMPL2(GENERATE?" && target_commands-ITEM && target_commands-macro set_property && target_commands-args SOURCE ${input:SRC} APPEND PROPERTY COMPILE_OPTIONS ":"", Args...) {
     .SEM=$GENERATE $Args
 }
 
@@ -3022,7 +3029,7 @@ macro _ADD_EXTRA_FLAGS_IMPL(GENERATE?" && set_property SOURCE ${input:SRC} APPEN
 ### @usage: _ADD_EXTRA_FLAGS([GENERATE] Args...) # internal
 ### Generate prefix = " && set_property SOURCE ${input:SRC} APPEND PROPERTY COMPILE_OPTIONS " if Args is not empty
 macro _ADD_EXTRA_FLAGS(COMPILE_OUT_SUFFIX="", Args...) {
-    .SEM=$_ADD_EXTRA_FLAGS_IMPL(${pre=GENERATE :Args})
+    .SEM=$_ADD_EXTRA_FLAGS_IMPL(${pre=GENERATE :Args}) $_ADD_EXTRA_FLAGS_IMPL2(${pre=GENERATE :Args})
 }
 
 _EMPTY_CMD=