Mercurial > mxe-octave

changeset 6893:caa19ef0ff93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Adjust paths for Qt6 tools in MXE_* variables. * Makefile.in: The tools for Qt6 are installed at a prefix that isn't in the search PATH by default. Adjust MXE_* variables for native build configurations so dependent packages are using the correct tools.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 01 Oct 2023 14:47:09 +0200
parents fe46a604d08b
children 7b5dcd048534
files Makefile.in
diffstat 1 files changed, 13 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Sun Oct 01 14:42:11 2023 +0200
+++ b/Makefile.in	Sun Oct 01 14:47:09 2023 +0200
@@ -393,7 +393,6 @@
     MXE_STRIP := true
     MXE_WINDRES := windres
     MXE_PKG_CONFIG := pkg-config
-    MXE_QMAKE := qmake
     # Although the Fortran compiler is internally gfortran, we still
     # want to make it look like non-GNU compiler, otherwise libtool is
     # not playing nicely and trips over different variable values for
@@ -420,13 +419,21 @@
       MXE_WINDRES := true
     endif
     MXE_PKG_CONFIG := pkg-config
-    MXE_QMAKE := qmake
   endif
 
-  MXE_MOC := $(HOST_BINDIR)/moc
-  MXE_UIC := $(HOST_BINDIR)/uic
-  MXE_LRELEASE := $(HOST_BINDIR)/lrelease
-  MXE_RCC := $(HOST_BINDIR)/rcc
+  ifeq ($(ENABLE_QT),6)
+    MXE_QMAKE := $(HOST_PREFIX)/qt6/bin/qmake
+    MXE_MOC := $(HOST_PREFIX)/qt6/libexec/moc
+    MXE_UIC := $(HOST_PREFIX)/qt6/libexec/uic
+    MXE_LRELEASE := $(HOST_PREFIX)/qt6/bin/lrelease
+    MXE_RCC := $(HOST_PREFIX)/qt6/libexec/rcc
+  else
+    MXE_QMAKE := qmake
+    MXE_MOC := $(HOST_BINDIR)/moc
+    MXE_UIC := $(HOST_BINDIR)/uic
+    MXE_LRELEASE := $(HOST_BINDIR)/lrelease
+    MXE_RCC := $(HOST_BINDIR)/rcc
+  endif
 
   MXE_MKOCTFILE := $(HOST_BINDIR)/mkoctfile
   MXE_OCTAVECONFIG := $(HOST_BINDIR)/octave-config