mirror of
https://github.com/fish-shell/fish-shell.git
synced 2025-01-01 16:53:36 +08:00
update CMake requirement
find_rust uses LIST(POP_BACK), which was added in 3.15.
This commit is contained in:
parent
74b1247461
commit
044cea1bf3
|
@ -1,4 +1,4 @@
|
||||||
cmake_minimum_required(VERSION 3.5)
|
cmake_minimum_required(VERSION 3.15)
|
||||||
|
|
||||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
|
||||||
|
|
||||||
|
|
|
@ -123,7 +123,7 @@ Dependencies
|
||||||
Compiling fish requires:
|
Compiling fish requires:
|
||||||
|
|
||||||
- Rust (version 1.70 or later)
|
- Rust (version 1.70 or later)
|
||||||
- CMake (version 3.5 or later)
|
- CMake (version 3.15 or later)
|
||||||
- a C compiler (for system feature detection and the test helper binary)
|
- a C compiler (for system feature detection and the test helper binary)
|
||||||
- PCRE2 (headers and libraries) - optional, this will be downloaded if missing
|
- PCRE2 (headers and libraries) - optional, this will be downloaded if missing
|
||||||
- gettext (headers and libraries) - optional, for translation support
|
- gettext (headers and libraries) - optional, for translation support
|
||||||
|
|
2
debian/control
vendored
2
debian/control
vendored
|
@ -5,7 +5,7 @@ Maintainer: ridiculous_fish <corydoras@ridiculousfish.com>
|
||||||
Uploaders: David Adam <zanchey@ucc.gu.uwa.edu.au>
|
Uploaders: David Adam <zanchey@ucc.gu.uwa.edu.au>
|
||||||
Build-Depends: debhelper (>= 12),
|
Build-Depends: debhelper (>= 12),
|
||||||
cargo (>= 0.66) | cargo-mozilla (>= 0.66),
|
cargo (>= 0.66) | cargo-mozilla (>= 0.66),
|
||||||
cmake (>= 3.19.0) | cmake-mozilla (>= 3.19.0),
|
cmake (>= 3.15.0) | cmake-mozilla (>= 3.15.0),
|
||||||
gettext,
|
gettext,
|
||||||
libpcre2-dev,
|
libpcre2-dev,
|
||||||
rustc (>= 1.70),
|
rustc (>= 1.70),
|
||||||
|
|
|
@ -14,7 +14,7 @@ BuildRequires: cargo gettext gcc xz pcre2-devel
|
||||||
BuildRequires: rust >= 1.70
|
BuildRequires: rust >= 1.70
|
||||||
# Packaging guidelines say to use a BuildRequires: rust-packaging, but it adds no value for our package
|
# Packaging guidelines say to use a BuildRequires: rust-packaging, but it adds no value for our package
|
||||||
|
|
||||||
BuildRequires: cmake >= 3.19
|
BuildRequires: cmake >= 3.15
|
||||||
|
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
|
|
Loading…
Reference in New Issue
Block a user