From cd3d3957c502295b9986f47b79ae6598a8d0377a Mon Sep 17 00:00:00 2001
From: Kornel Benko <kornel@lyx.org>
Date: Thu, 24 Oct 2024 14:36:40 +0200
Subject: [PATCH] Amend 09684899d68972ff2dc415218a8411fc7ccc2b69 for cmake
 build:

---
 development/cmake/ConfigureChecks.cmake | 27 -------------------------
 development/cmake/config.h.cmake        |  6 ------
 2 files changed, 33 deletions(-)

diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index ef02a85157..d04e2feebf 100644
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -185,19 +185,6 @@ else()
   LYX_CALLSTACK_PRINTING)
 endif()
 
-# Check whether STL is libstdc++
-check_cxx_source_compiles(
-	"
-	#include <vector>
-	int main() {
-	#if ! defined(__GLIBCXX__) && ! defined(__GLIBCPP__)
-		this is not libstdc++
-	#endif
-		return(0);
-	}
-	"
-lyx_cv_lib_stdcxx)
-
 # Check whether STL is libstdc++ with C++11 ABI
 check_cxx_source_compiles(
 	"
@@ -232,8 +219,6 @@ check_cxx_source_compiles(
   "
 HAVE_DEF_MAKE_UNIQUE)
 
-LYX_USE_STD_CALL_ONCE)
-
 if (ENCHANT_FOUND)
   set(CMAKE_REQUIRED_INCLUDES ${ENCHANT_INCLUDE_DIR})
   set(CMAKE_REQUIRED_LIBRARIES ${ENCHANT_LIBRARY})
@@ -252,19 +237,7 @@ if (ENCHANT_FOUND)
   endif()
 endif()
 
-set(USE_LLVM_LIBCPP)
-set(STD_STRING_USES_COW)
 set(USE_GLIBCXX_CXX11_ABI)
-if(lyx_cv_lib_stdcxx)
-  if(NOT USE_GLIBCXX_CXX11_ABI)
-    set(STD_STRING_USES_COW 1)
-  endif()
-else()
-  if(lyx_cv_prog_clang)
-    # use libc++ provided by llvm instead of GNU libstdc++
-    set(USE_LLVM_LIBCPP 1)
-  endif()
-endif()
 
 set(HAVE_QT5_X11_EXTRAS)
 set(HAVE_QT6_X11_EXTRAS)
diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 6b5b82f803..d2427194e6 100644
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -53,12 +53,6 @@
 // Define if callstack can be printed
 #cmakedefine LYX_CALLSTACK_PRINTING 1
 
-// Define if std::string uses copy-on-write
-#cmakedefine STD_STRING_USES_COW 1
-
-// use libc++ provided by llvm instead of GNU libstdc++
-#cmakedefine USE_LLVM_LIBCPP 1
-
 // use GNU libstdc++ with C++11 ABI
 #cmakedefine USE_GLIBCXX_CXX11_ABI 1