zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add qmake virtual provider (#38848)

Browse Source
This commit is contained in:
Adam J. Stewart 2023-08-02 13:50:37 -05:00 committed by GitHub
parent 11b3dac705
commit edbf12cfa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/spack/defaults/packages.yaml
View File

@ -49,6 +49,7 @@ packages:
pbs: [openpbs, torque] pbs: [openpbs, torque]
pil: [py-pillow] pil: [py-pillow]
pkgconfig: [pkgconf, pkg-config] pkgconfig: [pkgconf, pkg-config]
qmake: [qt-base, qt]
rpc: [libtirpc] rpc: [libtirpc]
scalapack: [netlib-scalapack, amdscalapack] scalapack: [netlib-scalapack, amdscalapack]
sycl: [hipsycl] sycl: [hipsycl]

2
lib/spack/spack/build_systems/qmake.py
View File

@ -28,7 +28,7 @@ class QMakePackage(spack.package_base.PackageBase):
build_system("qmake") 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") @spack.builder.builder("qmake")

2
var/spack/repos/builtin/packages/qt-base/package.py
View File

@ -33,6 +33,8 @@ def get_list_url(qualname):
maintainers("wdconinc", "sethrj") maintainers("wdconinc", "sethrj")
provides("qmake")
# Default dependencies for all qt-* components # Default dependencies for all qt-* components
generator("ninja") generator("ninja")
depends_on("cmake@3.16:", type="build") depends_on("cmake@3.16:", type="build")

2
var/spack/repos/builtin/packages/qt/package.py
View File

@ -69,6 +69,8 @@ class Qt(Package):
variant("tools", default=True, description="Build tools, including Qt Designer.") variant("tools", default=True, description="Build tools, including Qt Designer.")
variant("webkit", default=False, description="Build the Webkit extension") variant("webkit", default=False, description="Build the Webkit extension")
provides("qmake")
# Patches for qt@3 # Patches for qt@3
patch("qt3-accept.patch", when="@3") patch("qt3-accept.patch", when="@3")
patch("qt3-headers.patch", when="@3") patch("qt3-headers.patch", when="@3")