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

Remove qt variant in cmake (#39360)

Browse Source 
`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
```
This commit is contained in:
Harmen Stoppels 2023-08-10 11:59:22 +02:00 committed by GitHub
parent 3f83ef6566
commit ff07fd5ccb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
var/spack/repos/builtin/packages/cmake/package.py
View File

@ -186,7 +186,6 @@ class Cmake(Package):
# a build dependency, and its libs will not interfere with others in # a build dependency, and its libs will not interfere with others in
# the build. # the build.
variant("ownlibs", default=True, description="Use CMake-provided third-party libraries") variant("ownlibs", default=True, description="Use CMake-provided third-party libraries")
variant("qt", default=False, description="Enables the build of cmake-gui")
variant( variant(
"doc", "doc",
default=False, default=False,
@ -233,7 +232,6 @@ class Cmake(Package):
depends_on("libuv@1.10.0:", when="@3.12.0:") depends_on("libuv@1.10.0:", when="@3.12.0:")
depends_on("rhash", when="@3.8.0:") depends_on("rhash", when="@3.8.0:")
depends_on("qt", when="+qt")
depends_on("ncurses", when="+ncurses") depends_on("ncurses", when="+ncurses")
with when("+doc"): with when("+doc"):
@ -277,8 +275,6 @@ class Cmake(Package):
when="@3.19.0:3.19", 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 # https://gitlab.kitware.com/cmake/cmake/issues/18166
conflicts("%intel", when="@3.11.0:3.11.4") conflicts("%intel", when="@3.11.0:3.11.4")
conflicts("%intel@:14", when="@3.14:", msg="Intel 14 has immature C++11 support") conflicts("%intel@:14", when="@3.14:", msg="Intel 14 has immature C++11 support")
@ -358,11 +354,7 @@ def bootstrap_args(self):
# Whatever +/~ownlibs, use system curl. # Whatever +/~ownlibs, use system curl.
args.append("--system-curl") args.append("--system-curl")
args.append("--no-qt-gui")
if "+qt" in spec:
args.append("--qt-gui")
else:
args.append("--no-qt-gui")
if "+doc" in spec: if "+doc" in spec:
args.append("--sphinx-html") args.append("--sphinx-html")