From ff07fd5ccb47fefe8d384bea78d223f23bd76878 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Thu, 10 Aug 2023 11:59:22 +0200 Subject: 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 ``` --- var/spack/repos/builtin/packages/cmake/package.py | 10 +--------- 1 file changed, 1 insertion(+), 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") -- cgit v1.2.3-60-g2f50