4 commits

Author	SHA1	Message	Date
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