[vlc-commits] [Git][videolan/vlc][master] contrib: qt: use qmake6 instead of qtpaths6 to get pathes

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
3bb7c0e5 by Steve Lhomme at 2024-05-30T11:46:37+00:00
contrib: qt: use qmake6 instead of qtpaths6 to get pathes

Apparently on ArchLinux qmake6 is in the PATH, but not qtpaths6.

- - - - -


1 changed file:

- contrib/src/main.mak


Changes:

=====================================
contrib/src/main.mak
=====================================
@@ -541,11 +541,11 @@ 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, qtpaths6 --query QT_VERSION),$(QTBASE_VERSION_MAJOR))
+ifeq ($(call system_tool_majmin, qmake6 -query QT_VERSION),$(QTBASE_VERSION_MAJOR))
 # using system Qt native tools
 ifdef HAVE_CROSS_COMPILE
- QT_HOST_PREFIX := $(shell PATH="${SYSTEM_PATH}" qtpaths6 --query QT_HOST_PREFIX)
- QT_HOST_LIBS := $(shell PATH="${SYSTEM_PATH}" qtpaths6 --query QT_HOST_LIBS)
+ QT_HOST_PREFIX := $(shell PATH="${SYSTEM_PATH}" qmake6 -query QT_HOST_PREFIX)
+ QT_HOST_LIBS := $(shell PATH="${SYSTEM_PATH}" qmake6 -query QT_HOST_LIBS)
  QT_HOST_PATH := -DQT_HOST_PATH=$(QT_HOST_PREFIX) -DQT_HOST_PATH_CMAKE_DIR=$(QT_HOST_LIBS)/cmake
 endif
 else



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/3bb7c0e5aa71a9d022668ef049543a495fcb5061

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/3bb7c0e5aa71a9d022668ef049543a495fcb5061
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance