Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
7bec2248 by Steve Lhomme at 2024-06-13T11:10:17+00:00
contrib: call qmake6 less often when it's not found or the version
doesn't match
We only use QT_LIBEXECS and QT_BINS locally to check native tools.
If the Qt version doesn't match or qmake6 is not found, we don't need
to call it that many times.
This also avoids logging errors like:
> make: qmake6: Command not found
- - - - -
1 changed file:
- contrib/src/main.mak
Changes:
=====================================
contrib/src/main.mak
=====================================
@@ -542,6 +542,8 @@ MESONCLEAN = rm -rf $(BUILD_DIR)/meson-private
MESONBUILD = meson compile -C $(BUILD_DIR) $(MESON_BUILD) && meson install -C
$(BUILD_DIR)
# shared Qt config
+ifeq ($(call system_tool_majmin, qmake6 -query QT_VERSION
2>/dev/null),$(QTBASE_VERSION_MAJOR))
+
ifdef HAVE_CROSS_COMPILE
QT_LIBEXECS := $(shell qmake6 -query QT_HOST_LIBEXECS)
QT_BINS := $(shell qmake6 -query QT_HOST_BINS)
@@ -550,7 +552,6 @@ QT_LIBEXECS := $(shell qmake6 -query
QT_INSTALL_LIBEXECS):$(shell qmake6 -query
QT_BINS := $(shell qmake6 -query QT_INSTALL_BINS):$(shell qmake6 -query
QT_HOST_BINS)
endif
-ifeq ($(call system_tool_majmin, qmake6 -query
QT_VERSION),$(QTBASE_VERSION_MAJOR))
ifeq ($(call system_tool_majmin, PATH="${QT_LIBEXECS}" moc
--version),$(QTBASE_VERSION_MAJOR))
ifeq ($(call system_tool_majmin, PATH="${QT_BINS}" qsb
--version),$(QTBASE_VERSION_MAJOR))
ifeq ($(call system_tool_majmin, PATH="${QT_LIBEXECS}" qmlcachegen
--version),$(QTBASE_VERSION_MAJOR))
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/7bec2248881429c07fc5f2135c70377485aa5990
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/7bec2248881429c07fc5f2135c70377485aa5990
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
