github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-01-31 18:08:29 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Remove more cmake configurechecks

Browse Source 
PCRE2 is now handled by the crate, we don't need WCHAR_T_BITS anymore
This commit is contained in:
Fabian Boehm 2024-01-21 09:46:47 +01:00
parent 1234c77b15
commit 8cf4d666b3
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/ConfigureChecks.cmake
View File

@ -2,13 +2,6 @@
# CMAKE_REQUIRED_DEFINITIONS, CMAKE_REQUIRED_FLAGS, CMAKE_REQUIRED_LIBRARIES, # CMAKE_REQUIRED_DEFINITIONS, CMAKE_REQUIRED_FLAGS, CMAKE_REQUIRED_LIBRARIES,
# and CMAKE_REQUIRED_INCLUDES # and CMAKE_REQUIRED_INCLUDES
list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE=1) list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE=1)
include(CMakePushCheckState)
# An unrecognized flag is usually a warning and not an error, which CMake apparently does
# not pick up on. Combine it with -Werror to determine if it's actually supported.
# This is not bulletproof; old versions of GCC only emit a warning about unrecognized warning
# options when there are other warnings to emit :rolleyes:
# See https://github.com/fish-shell/fish-shell/commit/fe2da0a9#commitcomment-47431659
# Try using CMake's own logic to locate curses/ncurses # Try using CMake's own logic to locate curses/ncurses
find_package(Curses) find_package(Curses)
@ -36,7 +29,3 @@ else()
set(CURSES_LIBRARY ${CURSES_LIBRARY} ${CURSES_TINFO}) set(CURSES_LIBRARY ${CURSES_LIBRARY} ${CURSES_TINFO})
endif() endif()
endif() endif()
# This is required for finding the right PCRE2
include(CheckTypeSize)
check_type_size("wchar_t[8]" WCHAR_T_BITS LANGUAGE CXX)