Changeset 3328 in kBuild

Timestamp:

Apr 18, 2020 6:05:25 PM (5 years ago)

Author:

bird

Message:

units/qt5.kmk: Deal with quote paths when kmk supports it.

File:

• trunk/kBuild/units/qt5.kmk (modified) (9 diffs)

trunk/kBuild/units/qt5.kmk

@@ -382 +382 @@
 TOOL_QT5_MOC_CPP_OUTPUT =
 TOOL_QT5_MOC_CPP_OUTPUT_MAYBE =
-define TOOL_QT5_MOC_CPP_CMDS
+if1of (quote, $(KMK_FEATURES))
+ define TOOL_QT5_MOC_CPP_CMDS
+        $(QUIET)$(TOOL_QT5_MOC_KSUBMIT)$(TOOL_QT5_MOC)\
+                $(flags)\
+                $(qaddprefix sh,-I, $(incs))\
+                $(qaddprefix sh,-D, $(defs))\
+                -o $(out)\
+                $(source)
+ endef
+else
+ define TOOL_QT5_MOC_CPP_CMDS
         $(QUIET)$(TOOL_QT5_MOC_KSUBMIT)$(TOOL_QT5_MOC)\
                 $(flags)\
@@ -389 +399 @@
                 -o $(out)\
                 $(source)
-endef
+ endef
+endif
 
 ## MOC a C++ header file.
@@ -405 +416 @@
 TOOL_QT5_MOC_HPP_OUTPUT =
 TOOL_QT5_MOC_HPP_OUTPUT_MAYBE =
-define TOOL_QT5_MOC_HPP_CMDS
+if1of (quote, $(KMK_FEATURES))
+ define TOOL_QT5_MOC_HPP_CMDS
+        $(QUIET)$(TOOL_QT5_MOC_KSUBMIT)$(TOOL_QT5_MOC)\
+                $(flags)\
+                $(qaddprefix sh,-I, $(incs))\
+                $(qaddprefix sh,-D, $(defs))\
+                -o $(out)\
+                $(source)
+ endef
+else
+ define TOOL_QT5_MOC_HPP_CMDS
         $(QUIET)$(TOOL_QT5_MOC_KSUBMIT)$(TOOL_QT5_MOC)\
                 $(flags)\
@@ -412 +433 @@
                 -o $(out)\
                 $(source)
-endef
+ endef
+endif
 
 ## Compile a Qt user interface file (.ui).
@@ -573 +595 @@
 # default path + source dep.
 ifneq ($(defpath),)
+ if1of (quote, $(KMK_FEATURES))
+local source    := $(qabspathex ,$(source),$(defpath))
+local deps      := $(qabspathex ,$(deps),$(defpath)) $(source)
+local incs      := $(qabspathex ,$(incs),$(defpath))
+ else
 local source    := $(abspathex $(source),$(defpath))
 local deps      := $(abspathex $(deps),$(defpath)) $(source)
 local incs      := $(abspathex $(incs),$(defpath))
+ endif
 else
 local deps      += $(source)
@@ -667 +695 @@
 # default path + source dep.
 ifneq ($(defpath),)
+ if1of (quote, $(KMK_FEATURES))
 local source    := $(abspathex $(source),$(defpath))
 local deps      := $(abspathex $(deps),$(defpath)) $(source)
 local incs      := $(abspathex $(incs),$(defpath))
+ else
+local source    := $(qabspathex ,$(source),$(defpath))
+local deps      := $(qabspathex ,$(deps),$(defpath)) $(source)
+local incs      := $(qabspathex ,$(incs),$(defpath))
+ endif
 else
 local deps      += $(source)
@@ -760 +794 @@
 # default path + source dep.
 ifneq ($(defpath),)
+ if1of (quote, $(KMK_FEATURES))
+local source    := $(qabspathex ,$(source),$(defpath))
+local deps      := $(qabspathex ,$(deps),$(defpath)) $(source)
+local incs      := $(qabspathex ,$(incs),$(defpath))
+ else
 local source    := $(abspathex $(source),$(defpath))
 local deps      := $(abspathex $(deps),$(defpath)) $(source)
 local incs      := $(abspathex $(incs),$(defpath))
+ endif
 else
 local deps      += $(source)
@@ -861 +901 @@
 # default path + source dep.
 ifneq ($(defpath),)
+ if1of (quote, $(KMK_FEATURES))
+local source    := $(qabspathex ,$(source),$(defpath))
+local deps      := $(qabspathex ,$(deps),$(defpath)) $(source)
+local incs      := $(qabspathex ,$(incs),$(defpath))
+ else
 local source    := $(abspathex $(source),$(defpath))
 local deps      := $(abspathex $(deps),$(defpath)) $(source)
 local incs      := $(abspathex $(incs),$(defpath))
+ endif
 else
 local deps      += $(source)
@@ -957 +1003 @@
 # default path + source dep.
 ifneq ($(defpath),)
+ if1of (quote, $(KMK_FEATURES))
+local source    := $(qabspathex ,$(source),$(defpath))
+local deps      := $(qabspathex ,$(deps),$(defpath)) $(source)
+local incs      := $(qabspathex ,$(incs),$(defpath))
+ else
 local source    := $(abspathex $(source),$(defpath))
 local deps      := $(abspathex $(deps),$(defpath)) $(source)
 local incs      := $(abspathex $(incs),$(defpath))
+ endif
 else
 local deps      += $(source)