Commit Graph

34 Commits

Author SHA1 Message Date
Reno Dakota
8c9c8ade2f
cmake: fix strictDeps
patch cmake to implement a NIXPKGS_CMAKE_PREFIX_PATH env variable which
is similar to CMAKE_PREFIX_PATH except it is not searched for programs.

This is required because cmake will search CMAKE_PREFIX_PATH for
programs before PATH which is problematic as that means buildInputs gets
searched before nativeBuildInputs which can break things when the
binaries in PATH are covered or the order re-arranged.
2024-07-27 18:36:23 +00:00
Reno Dakota
00cb5c8fc4
cmake: use addToSearchPath 2024-07-27 18:36:22 +00:00
Vladimír Čunát
e2f5764068
Merge #323286: cmake: fix file fixing process
...into staging
2024-07-20 09:42:16 +02:00
Vladimír Čunát
5155e0c03b
cmake: refactor setup hook's find command
It became unnecessarily repetitive and complicated.
2024-07-20 09:41:02 +02:00
siddharth-narayan
4f8de0d551 cmake: Add -type f filter to find command
This commit adds the -type f filter to the find command. Previously, -type f
only applied to the first file name: *.cmake. The -o command means that -type f
has to be added back for the other file names.
2024-06-29 16:45:24 -04:00
Alexis Hildebrandt
436b46b69f cmake: 3.29.3 -> 3.29.6 2024-06-18 12:33:27 +02:00
Ben Siraphob
924b59b584
Merge pull request #286473 from raboof/cmake-cross-compilation
cmake: enable cross compilation
2024-06-16 08:21:44 +00:00
Vladimír Čunát
f1e3df16b3
Merge #310117: cmake: 3.29.2 -> 3.29.3
...into staging
2024-05-30 10:52:17 +02:00
Audrey Dutcher
ffb781820b cmake: remove propagatedBuildInput ps and patch to use an abspath
This would be an approprate patch on all platforms, but it seems to
trigger infinite recursion.
2024-05-20 16:08:30 +02:00
Audrey Dutcher
11f90585cd cmake: propagate ps as a build input on native FreeBSD 2024-05-20 16:08:30 +02:00
AMS21
651971f2f3
cmake: 3.29.2 -> 3.29.3 2024-05-08 15:58:43 +02:00
Sergei Trofimovich
80dac46dcf cmake: 3.29.1 -> 3.29.2
Changes: https://cmake.org/cmake/help/latest/release/3.29.html#id2
2024-04-14 21:55:52 +01:00
Mario Rodas
6083fb0a15 cmake: 3.29.0 -> 3.29.1
Diff: https://gitlab.kitware.com/cmake/cmake/-/compare/v3.29.0...v3.29.1
2024-04-05 04:20:00 +00:00
Arnout Engelen
596ca95c57 cmake: enable cross compilation
When cross-compiling cmake, for example with
`nix build .#pkgsCross.mipsel-linux-gnu.cmake`, the `configure`
script will invoke the build platform cmake to build the
host platform cmake. Usually, stdenv will automatically pass
variables such as `-DCMAKE_SYSTEM_PROCESSOR` to cmake
(https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/make-derivation.nix#L416),
but since here cmake is invoked 'indirectly' we have to pass
these parameters to the `configure` script ourselves.

It appears this was (surprisingly) not necessary on versions
through 3.26.4, but the update to 3.27.7 exposed that these
flags were missing, causing link failures.

Fixes #284734
2024-04-03 23:20:11 +02:00
R. Ryantm
3eedc01a98 cmake: 3.28.3 -> 3.29.0 2024-03-25 18:25:35 +00:00
github-actions[bot]
3174119b20
Merge staging-next into staging 2024-02-28 00:02:28 +00:00
Elian Doran
31b1dd083c
cmake: add meta.mainProgram 2024-02-27 20:28:27 +02:00
Sergei Trofimovich
a9de206ed4 cmake: 3.28.2 -> 3.28.3
While at it added trivial updater.

Changes: https://gitlab.kitware.com/cmake/cmake/-/compare/v3.28.2...v3.28.3?from_project_id=541&straight=false
2024-02-19 21:46:13 +00:00
Artem Leshchev
1a16930721 cmake: fix patch for darwin
The patch was malformed and did not apply before.
2024-02-16 13:23:03 +03:00
Jacek Galowicz
1bee8a0b0a cmake: 3.28.1 -> 3.28.2 2024-02-14 07:34:03 +00:00
Guillaume Racicot
aeb939f81f cmake: 3.27.9 -> 3.28.1 2024-02-08 10:12:15 -05:00
Alyssa Ross
4a5606d31f cmake: enable debug info 2024-01-23 16:23:44 +01:00
Sandro
f5076d066b
Merge pull request #271629 from trofi/cmake-update 2024-01-23 10:52:05 +01:00
Nick Cao
8b2757a191
cmake: drop libatomic workaround for riscv 2023-12-16 16:27:08 -05:00
Sergei Trofimovich
791b761c61 cmake: 3.27.8 -> 3.27.9
Changes: https://github.com/Kitware/CMake/compare/v3.27.8...v3.27.9
2023-12-02 11:08:39 +00:00
Vladimír Čunát
c44890cbd0
Merge #267795: cmake: 3.27.7 -> 3.27.8
...into staging
2023-12-01 07:30:31 +01:00
github-actions[bot]
5f1b5197be
Merge staging-next into staging 2023-11-23 00:02:56 +00:00
Francesco Gazzetta
3832b75e4e cmake: fix risc-v build failure
riscv64 is failing due to missing atomic ops in gcc 12.
This commit works around the problem by linking against libatomic.

It can be reverted when we switch to gcc 13 (#268097)
2023-11-22 16:10:35 -03:00
Artturin
69b2aa71ab cmake: Fix feature check
Unconditional because once pie is enabled on glibc it will start to fail
2023-11-18 20:36:39 +02:00
Muhammad Falak R Wani
590745a7b6 cmake: 3.27.7 -> 3.27.8
Changelog: https://cmake.org/cmake/help/v3.27/release/3.27.html
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
2023-11-16 09:09:34 +05:30
Anderson Torres
cc9458e2b9 cmake: 3.26.4 -> 3.27.7
With that typical change on the fifth patch
2023-10-28 23:38:57 -03:00
Anderson Torres
c9eb8d14da cmake: rename isBootstrap to isMinimalBuild
Indeed there is few to no reason to call this "isBootstrap" since we do not
build cmake by using a previous cmake.

Also, add a warning to the use of the old option.
2023-10-28 23:38:57 -03:00
Anderson Torres
9f4436aa8c cmake: use lib.cmake* functions
Also, a bit of cosmetic rewriting.
2023-10-28 23:38:57 -03:00
Anderson Torres
0f4bc8579f cmake: migrate to by-name 2023-10-28 23:38:57 -03:00