h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-08 02:31:18 -03:00
Code Issues Packages Projects Releases Wiki Activity

Remove some more cmake bits

Browse Source
This commit is contained in:
Fabian Boehm
2024-01-20 09:10:46 +01:00
parent 6f31ec7a61
commit e73d7e26e4
3 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/ConfigureChecks.cmake
View File

@@ -37,10 +37,6 @@ else()
endif() endif()
endif() endif()
# Set up the config.h file. # This is required for finding the right PCRE2
include(CheckCXXSymbolExists)
include(CheckTypeSize) include(CheckTypeSize)
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)

12
cmake/Tests.cmake
View File

@@ -111,20 +111,12 @@ add_custom_target(tests_buildroot_target
${TEST_ROOT_DIR} ${TEST_ROOT_DIR}
DEPENDS fish fish_test_helper) DEPENDS fish fish_test_helper)
# CMake less than 3.9.0 "fully supports" setting an exit code to denote a skipped test, but then
# it just goes ahead and reports it as failed. Really?
if(${CMAKE_VERSION} VERSION_LESS "3.9.0")
set(CMAKE_SKIPPED_HACK "env" "CMAKE_SKIPPED_HACK=1")
else()
set(CMAKE_SKIPPED_HACK)
endif()
FILE(GLOB FISH_CHECKS CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/tests/checks/*.fish) FILE(GLOB FISH_CHECKS CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/tests/checks/*.fish)
foreach(CHECK ${FISH_CHECKS}) foreach(CHECK ${FISH_CHECKS})
get_filename_component(CHECK_NAME ${CHECK} NAME) get_filename_component(CHECK_NAME ${CHECK} NAME)
get_filename_component(CHECK ${CHECK} NAME_WE) get_filename_component(CHECK ${CHECK} NAME_WE)
add_test(NAME ${CHECK_NAME} add_test(NAME ${CHECK_NAME}
COMMAND ${CMAKE_SKIPPED_HACK} sh ${CMAKE_CURRENT_BINARY_DIR}/tests/test_driver.sh COMMAND sh ${CMAKE_CURRENT_BINARY_DIR}/tests/test_driver.sh
${CMAKE_CURRENT_BINARY_DIR}/tests/test.fish ${CHECK} ${CMAKE_CURRENT_BINARY_DIR}/tests/test.fish ${CHECK}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
) )
@@ -137,7 +129,7 @@ FILE(GLOB PEXPECTS CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/tests/pexpects/*.py)
foreach(PEXPECT ${PEXPECTS}) foreach(PEXPECT ${PEXPECTS})
get_filename_component(PEXPECT ${PEXPECT} NAME) get_filename_component(PEXPECT ${PEXPECT} NAME)
add_test(NAME ${PEXPECT} add_test(NAME ${PEXPECT}
COMMAND ${CMAKE_SKIPPED_HACK} sh ${CMAKE_CURRENT_BINARY_DIR}/tests/test_driver.sh COMMAND sh ${CMAKE_CURRENT_BINARY_DIR}/tests/test_driver.sh
${CMAKE_CURRENT_BINARY_DIR}/tests/interactive.fish ${PEXPECT} ${CMAKE_CURRENT_BINARY_DIR}/tests/interactive.fish ${PEXPECT}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
) )

1
cmake/gettext.cmake
View File

@@ -13,7 +13,6 @@ if(WITH_GETTEXT)
find_package(Intl QUIET) find_package(Intl QUIET)
find_package(Gettext) find_package(Gettext)
if(GETTEXT_FOUND) if(GETTEXT_FOUND)
set(HAVE_GETTEXT 1)
include_directories(${Intl_INCLUDE_DIR}) include_directories(${Intl_INCLUDE_DIR})
endif() endif()
if(APPLE) if(APPLE)