From 6491e08f5d96e61fcfef827301b9c6dbe15059b6 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 15 Mar 2023 19:53:59 -0600 Subject: [PATCH] qt-base: add qmake attribute (#36114) --- var/spack/repos/builtin/packages/qt-base/package.py | 3 +++ var/spack/repos/builtin/packages/qt/package.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/qt-base/package.py b/var/spack/repos/builtin/packages/qt-base/package.py index 2d7d959d4a..7170de50dc 100644 --- a/var/spack/repos/builtin/packages/qt-base/package.py +++ b/var/spack/repos/builtin/packages/qt-base/package.py @@ -242,3 +242,6 @@ def define_feature(key, variant=None): define("FEATURE_system_" + k, v) return args + + def setup_dependent_package(self, module, dependent_spec): + module.qmake = Executable(self.spec.prefix.bin.qmake) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index af553b615f..89dc0f0b79 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -335,7 +335,7 @@ def setup_dependent_build_environment(self, env, dependent_spec): env.prepend_path("QT_PLUGIN_PATH", self.prefix.plugins) def setup_dependent_package(self, module, dependent_spec): - module.qmake = Executable(join_path(self.spec.prefix.bin, "qmake")) + module.qmake = Executable(self.spec.prefix.bin.qmake) def get_mkspec(self): """Determine the mkspecs root directory and QT platform."""