VirtualBox

Changeset 99872 in vbox for trunk


Ignore:
Timestamp:
May 19, 2023 8:48:09 PM (17 months ago)
Author:
vboxsync
Message:

/Config.kmk: Some cleanups around VBOX_PATH_QT (untested). bugref:10450

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r99868 r99872  
    76677667  else if1of ($(KBUILD_TARGET), win)
    76687668   ifndef VBOX_WITH_QT6
    7669     VBOX_PATH_QT := $(rsort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*))
    7670     VBOX_PATH_QT := $(firstword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(VBOX_PATH_QT)) \
    7671                 $(filter-out %-vcc100 %-vcc110 %-vcc120 %-vcc140 %-vcc141 %-vcc142 %-vcc143 %-vcc150, $(VBOX_PATH_QT)))
     7669    VBOX_PATH_QT := $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG)/qt/v5*))
     7670    VBOX_PATH_QT := $(firstfile $(qfilter ,%-$(tolower $(VBOX_VCC_TOOL_STEM)),$(VBOX_PATH_QT)) \
     7671                $(qfilter-out ,%-vcc100 %-vcc110 %-vcc120 %-vcc140 %-vcc141 %-vcc142 %-vcc143 %-vcc150, $(VBOX_PATH_QT)))
    76727672    ifdef VBOX_PATH_QT
    76737673     PATH_SDK_QT5  := $(VBOX_PATH_QT)
     
    76757675    endif
    76767676   else # qt6
    7677     VBOX_PATH_QT := $(rsort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v6*))
    7678     VBOX_PATH_QT := $(firstword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(VBOX_PATH_QT)) \
    7679                 $(filter-out %-vcc100 %-vcc110 %-vcc120 %-vcc140 %-vcc141 %-vcc142 %-vcc143 %-vcc150, $(VBOX_PATH_QT)))
     7677    VBOX_PATH_QT := $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG)/qt/v6*))
     7678    VBOX_PATH_QT := $(firstfile $(qfilter ,%-$(tolower $(VBOX_VCC_TOOL_STEM)),$(VBOX_PATH_QT)) \
     7679                $(qfilter-out %-vcc100 %-vcc110 %-vcc120 %-vcc140 %-vcc141 %-vcc142 %-vcc143 %-vcc150, $(VBOX_PATH_QT)))
    76807680    ifdef VBOX_PATH_QT
    76817681     PATH_SDK_QT6  := $(VBOX_PATH_QT)
     
    76857685  else if1of ($(KBUILD_TARGET), linux solaris)
    76867686   ifndef VBOX_WITH_QT6
    7687     VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*)))
     7687    VBOX_PATH_QT ?= $(firstfile $(qversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG)/qt/v5*)))
    76887688   else # qt6
    7689     VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v6*)))
     7689    VBOX_PATH_QT ?= $(firstfile $(qversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG)/qt/v6*)))
    76907690   endif # qt6
    76917691   ifneq ($(VBOX_PATH_QT),)
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette