FUNCTIONS - support qt6

2 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c40daebd53..4470bd73dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2021-04-11 Treeve Jelbert <treeve@sourcemage.org>
+	* FUNCTIONS: add qt6 support to cmake_build
+
 2021-04-06 Treeve Jelbert <treeve@sourcemage.org>
 	* kde.gpg: add "Vlad Zahorodnii <vlad.zahorodnii@kde.org>"
 
diff --git a/FUNCTIONS b/FUNCTIONS
index d770aa010a..09c004786a 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -4,6 +4,7 @@
 
 QT4DIR=$INSTALL_ROOT/opt/qt4
 QT5DIR=$INSTALL_ROOT/usr
+QT6DIR=$INSTALL_ROOT/opt/qt6
 
 qt5_build() {
 # qmake uses its own flag settings
@@ -691,13 +692,16 @@ cmake_build() {
 
   message INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX &&
 
+  if is_depends_enabled $SPELL qt6base;then
+    OPTS+=" -DCMAKE_PREFIX_PATH=$QT6DIR/lib/cmake"
+  fi &&
+
   cmake -DCMAKE_INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX \
         -DCMAKE_INSTALL_DATADIR=share \
         -DCMAKE_INSTALL_DOCDIR=share/doc \
         -DCMAKE_INSTALL_INCLUDEDIR=include \
         -DCMAKE_INSTALL_LIBDIR=lib \
         -DCMAKE_INSTALL_MANDIR=share/man \
-        -DCMAKE_PREFIX_PATH=share/apps/cmake/modules \
         -DCMAKE_INSTALL_SYSCONFDIR=$INSTALL_ROOT/etc \
         -DCMAKE_BUILD_TYPE=$CM_BUILD_TYPE \
         -DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \