alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
232335 commits 217 branches 121 tags 4.5 GiB
Commit graph

239 commits

Author SHA1 Message Date
Alyssa Ross be1b22538a cmake: only set output paths with multiple outputs 
This brings cmake inline with the behaviour used for configure
scripts, defined in multiple-outputs.sh.  It's important because
that setup hook will only set shareDocName if multiple outputs are in
use (and setOutputFlags hasn't been disabled).  So previously,
CMAKE_INSTALL_DOCDIR would be set to $out/share/doc for single-output
derivations, instead of $out/share/doc/$shareDocName, which would
result in collisions.

Since this hook now uses the setOutputFlags variable, I had to remove
the empty assignment of it added in
a714284d8b.

Fixes: https://github.com/NixOS/nixpkgs/issues/82304
 2020-06-29 13:56:27 +00:00
R. RyanTM 9757111825 cmake: 3.17.2 -> 3.17.3 2020-06-19 10:54:01 +02:00
Orivej Desh 16d7f7edae Merge branch 'master' into staging 2020-05-22 09:13:23 +00:00
Thomas Tuegel 694d80b170
Merge pull request #87704 from veprbl/pr/cmake_32bit_workaround 
pkgsi686Linux.cmake: compile with _FILE_OFFSET_BITS=64 for 32-bit targets
 2020-05-19 06:13:58 -05:00
Dmitry Kalinkin 467a87ba1d
cmake: compile with _FILE_OFFSET_BITS=64 for 32-bit targets 2020-05-12 18:16:03 -04:00
John Ericson 1ac5398589 *-wrapper; Switch from infixSalt to suffixSalt 
I hate the thing too even though I made it, and rather just get rid of
it. But we can't do that yet. In the meantime, this brings us more
inline with autoconf and will make it slightly easier for me to write a
pkg-config wrapper, which we need.
 2020-05-12 00:44:44 -04:00
R. RyanTM 27752d41e6 cmake: 3.17.0 -> 3.17.2 2020-05-08 06:56:59 +02:00
Jan Tojnar a04625379a
Merge branch 'master' into staging-next 2020-04-13 18:50:35 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Daniel Șerbănescu b18e7e5b6a
cmake: 3.16.5 -> 3.17.0 2020-04-01 11:00:43 -05:00
R. RyanTM b3793e1181 cmake: 3.16.4 -> 3.16.5 2020-03-06 06:14:36 +00:00
Konrad Borowski 4bad7d67cd cmake_2_8: fix build 2020-02-20 16:09:14 +01:00
R. RyanTM f00bda0148 cmake: 3.16.3 -> 3.16.4 2020-02-12 09:07:49 +01:00
Daiderd Jordan 68513e4071
cmake: move CMAKE_OSX_ARCHITECTURES out of the stdenv 
This was initially introduced in 92188d9d17,
not clear how relevant this still is but i686 isn't supported anymore so
disable it explicitly.
 2020-01-31 21:52:13 +01:00
Daiderd Jordan b984c227d2
cmake: remove CMAKE_OSX_DEPLOYMENT_TARGET overrides 
We _do_ want minimum versions in our packages.
 2020-01-31 21:52:12 +01:00
R. RyanTM 6e6615dfcc cmake: 3.16.2 -> 3.16.3 2020-01-29 08:57:00 +01:00
Tobias Mayer dfee92cd2e cmake: 3.15.4 -> 3.16.2 2019-12-20 15:59:32 +01:00
Dima fea6b5f3e0 cmake: patching for harfbuzz location 
a patch to cmake to correctly locate harfbuzz:
https://gitlab.kitware.com/cmake/cmake/issues/19531,
needed for more recent pango.
 2019-12-02 02:30:04 +01:00
R. RyanTM 40a357a67e cmakeWithGui: 3.15.4 -> 3.15.5 2019-12-01 18:27:33 +01:00
John Ericson 5132cc822a
Merge pull request #72812 from NixOS/bash-no-undef-vars 
cc-wrapper, bintools-wrapper: Remove now unneeded `set {+,-}u`
 2019-11-08 15:26:14 -05:00
John Ericson 42ffaf5290 cmake: NIX_CFLAGS_COMPILE NIX_LDFLAG could be undefined 2019-11-08 13:24:20 -05:00
John Ericson cdbbaa91ed cmake: CMAKE_*_PATH can be undefined 2019-11-05 14:21:27 -05:00
John Ericson acd2d19484
Merge pull request #72347 from NixOS/bash-no-undef-vars 
treewide: `set -u` everywhere
 2019-11-04 19:52:33 -05:00
R. RyanTM 60024b53d7 cmakeWithGui: 3.15.1 -> 3.15.4 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cmake-cursesui-qt5ui/versions
 2019-11-03 10:42:27 +01:00
John Ericson b7f4bda282 treewide: *Phase(s)? variables are optional 
If these aren't defined, the stdenv defaults are used in the `*Phase`
case, or no extra phases are done, in the `*Phases` case.
 2019-11-01 14:44:44 -04:00
John Ericson 1290e532ea treewide: Make more dont* variables OK to be undefined in setup hooks 2019-11-01 14:44:44 -04:00
Dmitry Kalinkin c8041d97a5
cmake: process -iframework in setup-hook 
This fixes a regression in #26197

Fixes: f496357585 ('cc-wrapper: use -iframework instead of -F')
 2019-10-11 18:48:16 -04:00
R. RyanTM 5c0cdcfad2 cmakeWithGui: 3.14.5 -> 3.15.1 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cmake-cursesui-qt5ui/versions
 2019-08-03 20:19:16 -07:00
worldofpeace 883a1dffcf
Merge pull request #52859 from jtojnar/cmake-gid 
cmake: use multiple outputs for GNUInstallDirs
 2019-07-25 16:05:10 -04:00
Daiderd Jordan ed27ba064c
cmake: update ApplicationServices patch 2019-07-08 21:48:19 +02:00
Tobias Mayer d87c843b6f Integrate review suggestions 2019-07-03 08:50:18 +02:00
Tobias Mayer 2608669904 cmake: 3.13.4 -> 3.14.5 2019-07-03 08:50:18 +02:00
volth f3282c8d1e treewide: remove unused variables (#63177) 
* treewide: remove unused variables

* making ofborg happy
 2019-06-16 19:59:05 +00:00
Matthew Bauer eaadbdf1c3 cmake: don’t use cf-private 
cf-private is not necessary here. cmake just needs the CoreFoundation
framework to be used. swift-corefoundation seems to work fine in this case.

/cc @lnl7
 2019-04-26 21:54:49 -04:00
Matthew Bauer 91f0c848f4 cmake: set BUILD_TESTING=OFF when doCheck is false 
This means we can avoid building test suites that will never be run.
 2019-03-09 14:32:55 -05:00
Daiderd Jordan cb8e6f73f5
cmake: add cf-private on darwin 2019-02-24 11:32:47 +01:00
Daiderd Jordan c8aaadcc9d
cmake: disable ApplicationServices and CoreServices on darwin 2019-02-24 11:30:48 +01:00
Vladimír Čunát 052e34a66f
Merge #56059: cmake: 3.12.1 -> 3.13.4 (into staging) 2019-02-22 07:23:08 +01:00
Matthew Bauer ae3e8355ab
Merge pull request #56021 from illegalprime/fix/cmake-cross 
cmake: add ability to cross-compile cmake
 2019-02-19 22:34:15 -05:00
Sam Stites 9b38f6f09f
bump cmake to 3.13.4 2019-02-19 13:21:30 -05:00
Michael Eden cbbde55382 cmake: add ability to cross-compile cmake 2019-02-18 17:41:03 -05:00
Florian Franzen e0e4577c0f cmake: disable package registry 2019-01-31 10:17:55 +01:00
Jan Tojnar c0d2f92459
cmake: use multiple outputs for GNUInstallDirs 
CMake contains a module for more granular installation directories:

https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html

Let’s set the paths so that projects using the module can be more
easily split into multiple outputs.
 2018-12-25 20:51:31 +01:00
Matthew Bauer d492f53faf
Merge pull request #50527 from matthewbauer/ninja-check-phase 
Add check phase to ninja setup hook
 2018-11-20 16:55:12 -06:00
Matthew Bauer 70e2b0bef0 cmake: also set CTEST_PARALLEL_LEVEL 2018-11-19 18:14:44 -06:00
Matthew Bauer 285eb9a894 cmake: set CTEST_OUTPUT_ON_FAILURE globally 
We should always use this.
 2018-11-19 16:16:16 -06:00
Jan Malakhovski fe50c0c096 cmake_2_8: fix fetchpatch src 
Old link no longer works. There're other broken patches in that file,
but I was too lazy to investigate where one can download them now.
 2018-11-17 10:16:30 +00:00
Vladimír Čunát 2d6179d1e8
Merge branch 'master' into staging 
A few trivial conflicts due to *Platforms mass replace.
 2018-09-01 17:38:18 +02:00
Uli Baum 8aa09a2887 cmake_2_8: fix build, restore search-path.patch 
cmake 3.12 update in #44910 modified search-path.patch
and broke cmake 2.8. This restores the previous version
of the patch as search-path-2.8.patch
 2018-08-31 01:04:44 +02:00
John Ericson 0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff 
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
 2018-08-30 17:20:32 -04:00