Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 13:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove some more unused cmake bits

Browse source
This commit is contained in:
Fabian Boehm 2024-01-19 18:15:18 +01:00
parent cfeddcedb7
commit 5aa622daef
2 changed files with 0 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmake/ConfigureChecks.cmake
View file

@ -38,21 +38,9 @@ else()
endif() endif()
# Set up the config.h file. # Set up the config.h file.
set(PACKAGE_NAME "fish")
set(PACKAGE_TARNAME "fish")
include(CheckCXXSymbolExists) include(CheckCXXSymbolExists)
include(CheckCXXSourceCompiles)
include(CheckTypeSize) include(CheckTypeSize)
check_cxx_symbol_exists(gettext libintl.h HAVE_GETTEXT) check_cxx_symbol_exists(gettext libintl.h HAVE_GETTEXT)
check_type_size("wchar_t[8]" WCHAR_T_BITS LANGUAGE CXX) check_type_size("wchar_t[8]" WCHAR_T_BITS LANGUAGE CXX)
# Work around the fact that cmake does not propagate the language standard flag into
# the CHECK_CXX_SOURCE_COMPILES function. See CMake issue #16456.
# Ensure we do this after the FIND_PACKAGE calls which use C, and will error on a C++
# standards flag.
# Also see https://github.com/fish-shell/fish-shell/issues/5865
if(NOT POLICY CMP0067)
list(APPEND CMAKE_REQUIRED_FLAGS "${CMAKE_CXX${CMAKE_CXX_STANDARD}_EXTENSION_COMPILE_OPTION}")
endif()

11
cmake/gettext.cmake
View file

@ -43,14 +43,3 @@ set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${Intl_LIBRARIES})
if(Intl_FOUND AND Intl_LIBRARIES) if(Intl_FOUND AND Intl_LIBRARIES)
set(LIBINTL_INCLUDE "#include <libintl.h>") set(LIBINTL_INCLUDE "#include <libintl.h>")
endif() endif()
check_cxx_source_compiles("
${LIBINTL_INCLUDE}
#include <stdlib.h>
int main () {
extern int _nl_msg_cat_cntr;
int tmp = _nl_msg_cat_cntr;
exit(tmp);
}
"
HAVE__NL_MSG_CAT_CNTR)
cmake_pop_check_state()