From e73d7e26e4ea69df615543039d9aa8444ceb4e29 Mon Sep 17 00:00:00 2001
From: Fabian Boehm <FHomborg@gmail.com>
Date: Sat, 20 Jan 2024 09:10:46 +0100
Subject: [PATCH] Remove some more cmake bits

---
 cmake/ConfigureChecks.cmake |  6 +-----
 cmake/Tests.cmake           | 12 ++----------
 cmake/gettext.cmake         |  1 -
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 01435f5b5..e7a830f15 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -37,10 +37,6 @@ else()
     endif()
 endif()
 
-# Set up the config.h file.
-include(CheckCXXSymbolExists)
+# This is required for finding the right PCRE2
 include(CheckTypeSize)
-
-check_cxx_symbol_exists(gettext libintl.h HAVE_GETTEXT)
-
 check_type_size("wchar_t[8]" WCHAR_T_BITS LANGUAGE CXX)
diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake
index 435b5507e..ad11bfd5f 100644
--- a/cmake/Tests.cmake
+++ b/cmake/Tests.cmake
@@ -111,20 +111,12 @@ add_custom_target(tests_buildroot_target
                           ${TEST_ROOT_DIR}
                   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)
 foreach(CHECK ${FISH_CHECKS})
   get_filename_component(CHECK_NAME ${CHECK} NAME)
   get_filename_component(CHECK ${CHECK} NAME_WE)
   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}
     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})
   get_filename_component(PEXPECT ${PEXPECT} NAME)
   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}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
   )
diff --git a/cmake/gettext.cmake b/cmake/gettext.cmake
index 465b7cbcc..c56517a32 100644
--- a/cmake/gettext.cmake
+++ b/cmake/gettext.cmake
@@ -13,7 +13,6 @@ if(WITH_GETTEXT)
   find_package(Intl QUIET)
   find_package(Gettext)
   if(GETTEXT_FOUND)
-      set(HAVE_GETTEXT 1)
       include_directories(${Intl_INCLUDE_DIR})
   endif()
   if(APPLE)