github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-25 18:03:37 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Remove some now unused CMake bits

Browse Source
This commit is contained in:
Peter Ammon 2024-07-07 15:50:58 -07:00
parent 925382dc3e
commit 9edd0cf8ee
No known key found for this signature in database
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/PCRE2.cmake
View File

@ -1,18 +1,4 @@
# We can either use the system-installed PCRE or our bundled version. set(FISH_USE_SYSTEM_PCRE2 ON CACHE BOOL
# This is controlled by the cache variable FISH_USE_SYSTEM_PCRE2.
# Here we compute the default value for that variable.
# The actual decision is made by the Rust pcre2-sys crate, which searches for the
# pkg-config file and uses a vendored copy if it is not available.
if ((APPLE) AND (MAC_CODESIGN_ID))
# On Mac, a codesigned fish will refuse to load a non-codesigned PCRE2
# (e.g. from Homebrew) so default to bundled PCRE2.
set(USE_SYS_PCRE2_DEFAULT OFF)
else()
# Default to using the system PCRE2, if it can be found by the crate
set(USE_SYS_PCRE2_DEFAULT ON)
endif()
set(FISH_USE_SYSTEM_PCRE2 ${USE_SYS_PCRE2_DEFAULT} CACHE BOOL
"Try to use PCRE2 from the system, instead of the pcre2-sys version") "Try to use PCRE2 from the system, instead of the pcre2-sys version")
if(FISH_USE_SYSTEM_PCRE2) if(FISH_USE_SYSTEM_PCRE2)

2
cmake/Rust.cmake
View File

@ -42,7 +42,7 @@ get_property(
TARGET Rust::Rustc PROPERTY IMPORTED_LOCATION TARGET Rust::Rustc PROPERTY IMPORTED_LOCATION
) )
# Tell Cargo where our build directory is so it can find config.h. # Tell Cargo where our build directory is so it can find Cargo.toml.
set(VARS_FOR_CARGO set(VARS_FOR_CARGO
"FISH_BUILD_DIR=${fish_binary_dir}" "FISH_BUILD_DIR=${fish_binary_dir}"
"PREFIX=${CMAKE_INSTALL_PREFIX}" "PREFIX=${CMAKE_INSTALL_PREFIX}"