summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarmen Stoppels <harmenstoppels@gmail.com>2023-08-10 11:59:22 +0200
committerGitHub <noreply@github.com>2023-08-10 05:59:22 -0400
commitff07fd5ccb47fefe8d384bea78d223f23bd76878 (patch)
tree4ce72522a003f34873a6d84a8edd23ef4998773d
parent3f83ef6566b20de71b69345c81f159e0b4cbbc65 (diff)
downloadspack-ff07fd5ccb47fefe8d384bea78d223f23bd76878.tar.gz
spack-ff07fd5ccb47fefe8d384bea78d223f23bd76878.tar.bz2
spack-ff07fd5ccb47fefe8d384bea78d223f23bd76878.tar.xz
spack-ff07fd5ccb47fefe8d384bea78d223f23bd76878.zip
Remove qt variant in cmake (#39360)
`cmake+qt` depends on `qt`, which depends on `libmng`, which is a CMake package, and has been for 4 years. Nobody ever complained about `cmake+qt` not concretizing... so why pay the solve cost. Before: ``` setup 3.779s load 0.018s ground 2.625s solve 4.511s total 11.236s ``` After: ``` setup 3.734s load 0.018s ground 0.468s solve 0.560s total 5.080s ```
-rw-r--r--var/spack/repos/builtin/packages/cmake/package.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py
index 415b9b80cc..93ad49d4f8 100644
--- a/var/spack/repos/builtin/packages/cmake/package.py
+++ b/var/spack/repos/builtin/packages/cmake/package.py
@@ -186,7 +186,6 @@ class Cmake(Package):
# a build dependency, and its libs will not interfere with others in
# the build.
variant("ownlibs", default=True, description="Use CMake-provided third-party libraries")
- variant("qt", default=False, description="Enables the build of cmake-gui")
variant(
"doc",
default=False,
@@ -233,7 +232,6 @@ class Cmake(Package):
depends_on("libuv@1.10.0:", when="@3.12.0:")
depends_on("rhash", when="@3.8.0:")
- depends_on("qt", when="+qt")
depends_on("ncurses", when="+ncurses")
with when("+doc"):
@@ -277,8 +275,6 @@ class Cmake(Package):
when="@3.19.0:3.19",
)
- conflicts("+qt", when="^qt@5.4.0") # qt-5.4.0 has broken CMake modules
-
# https://gitlab.kitware.com/cmake/cmake/issues/18166
conflicts("%intel", when="@3.11.0:3.11.4")
conflicts("%intel@:14", when="@3.14:", msg="Intel 14 has immature C++11 support")
@@ -358,11 +354,7 @@ class Cmake(Package):
# Whatever +/~ownlibs, use system curl.
args.append("--system-curl")
-
- if "+qt" in spec:
- args.append("--qt-gui")
- else:
- args.append("--no-qt-gui")
+ args.append("--no-qt-gui")
if "+doc" in spec:
args.append("--sphinx-html")