From edbf12cfa85cd9e7e457e78e7cfc2f7aea25f604 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 2 Aug 2023 13:50:37 -0500 Subject: Add qmake virtual provider (#38848) --- etc/spack/defaults/packages.yaml | 1 + lib/spack/spack/build_systems/qmake.py | 2 +- var/spack/repos/builtin/packages/qt-base/package.py | 2 ++ var/spack/repos/builtin/packages/qt/package.py | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index 22b766264c..364b0d218e 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -49,6 +49,7 @@ packages: pbs: [openpbs, torque] pil: [py-pillow] pkgconfig: [pkgconf, pkg-config] + qmake: [qt-base, qt] rpc: [libtirpc] scalapack: [netlib-scalapack, amdscalapack] sycl: [hipsycl] diff --git a/lib/spack/spack/build_systems/qmake.py b/lib/spack/spack/build_systems/qmake.py index cd8fe0904b..538054f3b0 100644 --- a/lib/spack/spack/build_systems/qmake.py +++ b/lib/spack/spack/build_systems/qmake.py @@ -28,7 +28,7 @@ class QMakePackage(spack.package_base.PackageBase): build_system("qmake") - depends_on("qt", type="build", when="build_system=qmake") + depends_on("qmake", type="build", when="build_system=qmake") @spack.builder.builder("qmake") diff --git a/var/spack/repos/builtin/packages/qt-base/package.py b/var/spack/repos/builtin/packages/qt-base/package.py index 949d934144..7997d19b0e 100644 --- a/var/spack/repos/builtin/packages/qt-base/package.py +++ b/var/spack/repos/builtin/packages/qt-base/package.py @@ -33,6 +33,8 @@ class QtPackage(CMakePackage): maintainers("wdconinc", "sethrj") + provides("qmake") + # Default dependencies for all qt-* components generator("ninja") depends_on("cmake@3.16:", type="build") diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index b6897524c6..78d1d02b55 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -69,6 +69,8 @@ class Qt(Package): variant("tools", default=True, description="Build tools, including Qt Designer.") variant("webkit", default=False, description="Build the Webkit extension") + provides("qmake") + # Patches for qt@3 patch("qt3-accept.patch", when="@3") patch("qt3-headers.patch", when="@3") -- cgit v1.2.3-60-g2f50