Changeset 3349 in kBuild

Timestamp:

May 23, 2020 9:54:19 AM (5 years ago)

Author:

bird

Message:

units/qt5.kmk: Fixed inverted quoting check in the qrc/rcc handling. Change to check for KMK_WITH_QUOTING rather than scan KMK_FEATURES all the time.

File:

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

trunk/kBuild/units/qt5.kmk

@@ -382 +382 @@
 TOOL_QT5_MOC_CPP_OUTPUT =
 TOOL_QT5_MOC_CPP_OUTPUT_MAYBE =
-if1of (quote, $(KMK_FEATURES))
+ifdef KMK_WITH_QUOTING
  define TOOL_QT5_MOC_CPP_CMDS
         $(QUIET)$(TOOL_QT5_MOC_KSUBMIT)$(TOOL_QT5_MOC)\
@@ -416 +416 @@
 TOOL_QT5_MOC_HPP_OUTPUT =
 TOOL_QT5_MOC_HPP_OUTPUT_MAYBE =
-if1of (quote, $(KMK_FEATURES))
+ifdef KMK_WITH_QUOTING
  define TOOL_QT5_MOC_HPP_CMDS
         $(QUIET)$(TOOL_QT5_MOC_KSUBMIT)$(TOOL_QT5_MOC)\
@@ -595 +595 @@
 # default path + source dep.
 ifneq ($(defpath),)
- if1of (quote, $(KMK_FEATURES))
+ ifdef KMK_WITH_QUOTING
 local source    := $(qabspathex ,$(source),$(defpath))
 local deps      := $(qabspathex ,$(deps),$(defpath)) $(source)
@@ -695 +695 @@
 # default path + source dep.
 ifneq ($(defpath),)
- if1of (quote, $(KMK_FEATURES))
+ ifdef KMK_WITH_QUOTING
+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))
- else
-local source    := $(qabspathex ,$(source),$(defpath))
-local deps      := $(qabspathex ,$(deps),$(defpath)) $(source)
-local incs      := $(qabspathex ,$(incs),$(defpath))
  endif
 else
@@ -794 +794 @@
 # default path + source dep.
 ifneq ($(defpath),)
- if1of (quote, $(KMK_FEATURES))
+ ifdef KMK_WITH_QUOTING
 local source    := $(qabspathex ,$(source),$(defpath))
 local deps      := $(qabspathex ,$(deps),$(defpath)) $(source)
@@ -901 +901 @@
 # default path + source dep.
 ifneq ($(defpath),)
- if1of (quote, $(KMK_FEATURES))
+ ifdef KMK_WITH_QUOTING
 local source    := $(qabspathex ,$(source),$(defpath))
 local deps      := $(qabspathex ,$(deps),$(defpath)) $(source)
@@ -1003 +1003 @@
 # default path + source dep.
 ifneq ($(defpath),)
- if1of (quote, $(KMK_FEATURES))
+ ifdef KMK_WITH_QUOTING
 local source    := $(qabspathex ,$(source),$(defpath))
 local deps      := $(qabspathex ,$(deps),$(defpath)) $(source)