Commit graph

8 commits

Author SHA1 Message Date
Will Dietz
07849e749a cmake: When there is no stdenv.glibc, still fix search paths.
Apply all of the fixups from preConfigure as well!

For testing purposes I added the following assert:

assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc);

To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?)
wasn't changed, which passes in the configurations I could think of.

Not including that since it seems like a bad requirement moving forward.
2016-10-13 08:05:37 -05:00
Nikolay Amiantov
d528c7d8f5 cmake-2_8: fix for multiple outputs 2016-04-14 01:03:23 +03:00
Vladimír Čunát
b7fe141f6b Revert "remove cmake-2.8"
Some packages fail with the only cmake version we've left.
This reverts commit 67199bda4e.
2015-05-15 23:02:41 +02:00
Thomas Tuegel
67199bda4e remove cmake-2.8 2015-03-22 17:01:45 -05:00
Vladimír Čunát
7f1e09c35d Re-Revert "Merge pull request #567 from MarcWeber/submit/cmake-improvement"
This reverts commit b08e12b37a.
2013-06-27 15:14:32 +02:00
Peter Simons
b08e12b37a Revert "Merge pull request #567 from MarcWeber/submit/cmake-improvement"
This reverts commit abc7591aaf, reversing changes
made to 6b1ebeccf2, because they broke half the
packages in stdenv-updates: http://hydra.nixos.org/eval/927013 has further
details.
2013-06-17 10:19:15 +02:00
Marc Weber
f7ef08e5cd experimental/cmake-improvement
set CMAKE_LIBRARY_PATH, CMAKE_INCLUDE_PATH based on NIX_CFLAGS_COMPILE and
NIX_LDFLAGS so that cmake's find_library like functions find all the libraries
gcc knows about thanks to the gcc wrapper

This is particular useful with myEnvFun which then also sets those CMAKE_* env
variables.`

Because setup.sh has to change this causes many rebuilds - thus it should be
included in a stdenv-update like branch

Also cmake builds in parallel perfectly fine

update cmake to latest minor number, I didn't change the patches,
just reapplied them manually recordin a new patch
2013-05-28 16:22:45 +02:00
Eelco Dolstra
489d1be918 * Cmake updated to 2.8.5. Also added a patch that prevents Cmake from
looking in /usr and similar locations.  However, it *will* now look
  in the Nixpkgs Glibc lib and include directories.  This ensures that
  find_library can find libraries in Glibc.

svn path=/nixpkgs/branches/kde-4.7/; revision=27884
2011-07-21 18:21:38 +00:00