Eelco Dolstra
553abf71ba
Merge remote-tracking branch 'origin/staging' into gcc-4.9
...
Conflicts:
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/libraries/wayland/default.nix
pkgs/development/tools/build-managers/cmake/default.nix
pkgs/top-level/all-packages.nix
2015-06-01 20:08:43 +02:00
Florian Friesdorf
90a97d32df
cygwin cmake
2015-05-28 10:53:36 +02:00
Joel Taylor
1aef9fc4af
cmake: disable building with ncurses if building without ncurses
2015-05-15 14:31:40 -07:00
Eelco Dolstra
26f17ee091
cmake: Get rid of circular dependency
...
Also, don't install static libraries in jsoncpp.
2015-05-13 18:17:26 +02:00
William A. Kennington III
64c68c5413
cmake: 3.2.1 -> 3.2.2
2015-05-01 22:27:14 -07:00
Eric Seidel
c94b24fa4a
fix fallout from merge of master
2015-04-06 19:48:44 -07:00
William A. Kennington III
22018c40d1
cmake: Remove obsolete openssl patch
2015-03-27 11:30:39 -07:00
William A. Kennington III
767c179a94
Merge branch 'master' into staging
2015-03-26 14:44:05 -07:00
goodwillcoding
62d4564de4
fix the cmake 2.8.x detection of OpenSSL version broken in openssl 1.0.1m
...
this is a follow up to security update for openssl: 1.0.1l -> 1.0.1m,
references:
- http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=15386
- http://www.cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505#patch1
(cherry picked from commit 30dd174520
)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-03-26 11:42:02 +01:00
Thomas Tuegel
f47af9b2c8
remove cmake-3.0
2015-03-22 17:03:57 -05:00
Thomas Tuegel
a910301e18
make cmake-3.2 the default version
2015-03-22 17:00:46 -05:00
Eric Seidel
dbf3d31727
make llvm-3.5 the default and remove references to gccApple
...
make perl be less dumb
revert change to release.nix
2015-02-03 14:31:04 -08:00
Vladimír Čunát
02a1e85ab1
cmake, podofo: fix finding freetype-2.5
2014-06-26 18:24:44 +02:00
aszlig
5eb3dd8a1b
cmake: Add patch for fixing Darwin cross-builds.
...
This is an upstream patch and will eventually get into the next release.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:49 +01:00
Petr Rockai
abd8059802
cmake: Update to latest upstream (2.8.12.2).
2014-02-15 10:27:38 +01:00
Petr Rockai
6f5be260b4
Adopt packages.
2014-01-28 17:31:17 +01:00
bbenoist
e13720c3c4
cmake: Fix CTest custom commands
...
This commit is related to:
- https://github.com/NixOS/nixpkgs/issues/762
- http://public.kitware.com/Bug/view.php?id=13887
And fixes a bug present in recent CMake versions.
The fix should be integrated in the next CMake release.
2013-08-21 10:24:53 +02:00
bbenoist
bef090400e
cmake: Update to 2.8.11.2
2013-08-21 10:24:53 +02: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
Shea Levy
29fd8d4eaa
cmake: Bump
2012-10-08 03:12:42 -04:00
Ludovic Courtès
04600bbec1
Darwin: Add mig',
lipo', etc. to `stdenvNative'.
...
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.
svn path=/nixpkgs/trunk/; revision=33893
2012-04-23 15:47:31 +00:00
Yury G. Kudryashov
215a07c1a9
svn merge ^/nixpkgs/trunk
...
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)
The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Yury G. Kudryashov
71c28d0e33
Use meta.platforms
...
svn path=/nixpkgs/trunk/; revision=31909
2012-01-28 14:39:56 +00:00
Eelco Dolstra
28780d27d1
* cmake: don't use replace-literal.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31736
2012-01-20 15:10:28 +00:00
Yury G. Kudryashov
29d613ba0e
Add a warning to cmake/default.nix
...
svn path=/nixpkgs/trunk/; revision=31248
2012-01-03 18:00:02 +00:00
Eelco Dolstra
5386b47ead
* Revert. Cmake is still broken on i686-linux.
...
svn path=/nixpkgs/trunk/; revision=31244
2012-01-03 17:22:11 +00:00
Yury G. Kudryashov
71c6de7338
cmake-2.8.7
...
svn path=/nixpkgs/trunk/; revision=31241
2012-01-03 16:38:53 +00:00
Eelco Dolstra
bb889c3605
* Revert both r30278 (cmake upgrade) and r30307 (zlib fix to get cmake
...
to build). These are more appropriate to the stdenv branch. I'll
apply them there.
svn path=/nixpkgs/trunk/; revision=30308
2011-11-07 22:05:46 +00:00
David Guibert
29bdb369ab
update cmake
...
svn path=/nixpkgs/trunk/; revision=30278
2011-11-06 20:03:00 +00:00
Eelco Dolstra
35781b1bf3
* Cmake 2.8.5 doesn't build on i686-linux
...
(http://hydra.nixos.org/build/1181148 ), so revert to 2.8.4 for now.
svn path=/nixpkgs/branches/kde-4.7/; revision=27990
2011-07-28 14:09:16 +00: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
Peter Simons
05474e174b
cmake: updated meta.platforms to reflect the fact that CMake is supposed to build on all Unix-like platforms
...
svn path=/nixpkgs/trunk/; revision=26512
2011-03-25 12:55:33 +00:00
Peter Simons
5ba10a94e1
cmake: add install_name_tool on Darwin to fix the build
...
svn path=/nixpkgs/trunk/; revision=26511
2011-03-25 12:55:29 +00:00
Yury G. Kudryashov
53a7f85871
cmake-2.8.4
...
svn path=/nixpkgs/trunk/; revision=26137
2011-03-02 18:49:56 +00:00
Yury G. Kudryashov
2e92a0cd12
cmake-2.8.3
...
svn path=/nixpkgs/trunk/; revision=25859
2011-02-09 21:08:53 +00:00
Rob Vermaas
5b408a85da
build cmake only on linux and freebsd
...
svn path=/nixpkgs/trunk/; revision=25412
2011-01-05 10:04:49 +00:00
Yury G. Kudryashov
cd73464fdf
Mention UIs in cmake.name
...
svn path=/nixpkgs/trunk/; revision=24026
2010-10-02 05:24:39 +00:00
Yury G. Kudryashov
139de1ea2f
Don't try to build Qt guis if qt is unsupported on the platform
...
svn path=/nixpkgs/trunk/; revision=23812
2010-09-15 18:52:07 +00:00
Yury G. Kudryashov
48c13f4096
Update cmake
...
Use system libraries, make curses optional, add optional qt4 gui etc.
svn path=/nixpkgs/trunk/; revision=23810
2010-09-15 18:37:21 +00:00
Lluís Batlle i Rossell
bc54fc96da
Updating cmake. Big kde rebuild to come.
...
svn path=/nixpkgs/trunk/; revision=20996
2010-04-09 16:04:11 +00:00
Lluís Batlle i Rossell
4a6cfd435e
Removing a part of the cmake setup-hook that broke at least the findqt4 cmake module.
...
That way, we don't need the patch anymore to fix what that part broke.
Also kde stops needing the findqt4 patch (for its own copy of the findqt4 cmake module).
I tested a nixos-rebuild with kde4, and it builds as far as hydra built with this configuration.
svn path=/nixpkgs/trunk/; revision=20921
2010-04-01 18:19:44 +00:00
Lluís Batlle i Rossell
2dd9764a9e
Major update to cmake, from 2.6.4 to 2.8.0.
...
I tried some kde4 builds, and the worked.
svn path=/nixpkgs/trunk/; revision=18890
2009-12-11 07:58:54 +00:00
Lluís Batlle i Rossell
94d2e57c62
Trying to fix the cmake-qt problems, fixing cmake's FindQt4. Paraview now builds beyond 25%, while
...
before it didn't. Through this commit I expect the build farm to try to build kde, and see
whether this way it builds without the unusual NIX_CFLAGS_COMPILE set in the qt setup-hook.
svn path=/nixpkgs/trunk/; revision=15838
2009-06-03 09:19:19 +00:00
Lluís Batlle i Rossell
07caf9a9bd
Updated cmake
...
svn path=/nixpkgs/trunk/; revision=15807
2009-05-31 08:34:57 +00:00
Peter Simons
047f6d20d5
Updated CMake to version 2.6.3.
...
svn path=/nixpkgs/trunk/; revision=15114
2009-04-17 13:48:22 +00:00
Eelco Dolstra
62fa1a418f
* cmake setup hook: override the whole configurePhase rather than
...
setting a postUnpack hook.
svn path=/nixpkgs/trunk/; revision=14074
2009-02-13 14:43:01 +00:00
Peter Simons
6fb297513a
Committing Lluís Batlle's submissions from mailing list posting
...
<45219fb00901110456i6f21db35tbd1894eaea2146ff@mail.gmail.com>:
* nixpkgs-ccrypt-1.7-new.patch
* nixpkgs-cmake-add-ccmake.patch
* nixpkgs-cpufrequtils-005-new.patch
* nixpkgs-dwm-5.1-fix.patch
* nixpkgs-freeimage-3.11.0-new.patch
* nixpkgs-proxychains-3.1-new.patch
* nixpkgs-psi-to-0.12.patch
* nixpkgs-skype-to-2.0.0.72.patch
* nixpkgs-truecrypt-6.1a-fix.patch
* nixpkgs-vxl-1.11.0-new.patch
* nixpkgs-xkb-popular-esperanto-symbols.patch
* nixpkgs-xorg-via-video-fix.patch
svn path=/nixpkgs/trunk/; revision=13751
2009-01-12 21:12:07 +00:00
Peter Simons
6a051f96a2
Updated cmake to version 2.6.2.
...
svn path=/nixpkgs/trunk/; revision=13286
2008-11-13 21:05:01 +00:00