From 51f20932df47f0b96b41ef22960b5600e0e65800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luiz=20Rom=C3=A1rio=20Santana=20Rios?= Date: Tue, 27 Mar 2018 02:23:57 -0300 Subject: [PATCH] Add qtdir to the cmake commandline Summary: The qtdir config option from .kdesrc-buildrc was seemingly innefective, which is fixed by this patch Reviewers: mpyne Differential Revision: https://phabricator.kde.org/D11736 --- modules/ksb/BuildSystem/KDE4.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/ksb/BuildSystem/KDE4.pm b/modules/ksb/BuildSystem/KDE4.pm index ac33dcd..a491055 100644 --- a/modules/ksb/BuildSystem/KDE4.pm +++ b/modules/ksb/BuildSystem/KDE4.pm @@ -172,6 +172,12 @@ sub _safe_run_cmake push @commands, "-DCMAKE_INSTALL_PREFIX=$prefix"; + # Add custom Qt to the prefix + my $qtdir = $module->getOption('qtdir'); + if ($qtdir && $qtdir ne $prefix) { + push @commands, "-DCMAKE_PREFIX_PATH=$qtdir"; + } + if ($module->getOption('run-tests') && !grep { /^\s*-DKDE4_BUILD_TESTS(:BOOL)?=(ON|TRUE|1)\s*$/ } (@commands) )