Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake: 3.8.2 -> 3.9.1 #28954

Closed
wants to merge 2 commits into from
Closed

cmake: 3.8.2 -> 3.9.1 #28954

wants to merge 2 commits into from

Conversation

BerndAmend
Copy link
Contributor

@BerndAmend BerndAmend commented Sep 3, 2017

Motivation for this change

Update package to the upstream version.
In addition an option to compile cmake against qt5 has been added.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

cc @mornfall @ttuegel @LnL7

@mention-bot
Copy link

@tptb, thanks for your PR! By analyzing the history of the files in this pull request, we identified @7c6f434c, @abbradar and @dtzWill to be potential reviewers.

@ttuegel
Copy link
Member

ttuegel commented Sep 6, 2017

Your second commit says it makes withQt5 the default, but that does not seem to be the case. Could you clarify?

@BerndAmend
Copy link
Contributor Author

The comment is a little bit misleading. cmakeWithGui in the all-packages.nix builds the qt5 version, cmakeWithQt4Gui builds the qt4 version. Previously the qt4 version was build by cmakeWithGui.

@ttuegel
Copy link
Member

ttuegel commented Sep 6, 2017

Oh, I understand now! Thanks.

ttuegel added a commit that referenced this pull request Sep 6, 2017
@ttuegel
Copy link
Member

ttuegel commented Sep 6, 2017

Merged into staging by 78dde57.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants