X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2FConfigureChecks.cmake;h=6dc82a7d8788d75484792336cf3280da801de11d;hb=86826df4aacdad33ff28905ac25feee90972b575;hp=0d0731101242047d97f1d15c8b21659f19f0ff57;hpb=9c55af4a223ce4db29d643251109e245665344bd;p=lyx.git

diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index 0d07311012..6dc82a7d87 100644
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -33,6 +33,8 @@ foreach(_h_file aspell.h aspell/aspell.h limits.h locale.h
 	check_include_files(${_h_file} HAVE_${_HF})
 	set(Include_Defines "${Include_Defines}#cmakedefine HAVE_${_HF} 1\n")
 endforeach()
+check_include_file_cxx(regex HAVE_REGEX)
+set(Include_Defines "${Include_Defines}#cmakedefine HAVE_REGEX 1\n")
 configure_file(${LYX_CMAKE_DIR}/configIncludes.cmake ${TOP_BINARY_DIR}/configIncludes.h.cmake)
 configure_file(${TOP_BINARY_DIR}/configIncludes.h.cmake ${TOP_BINARY_DIR}/configIncludes.h)
 
@@ -137,7 +139,20 @@ check_cxx_source_compiles(
 		return(0);
 	}
 	"
-STD_STRING_USES_COW)
+lyx_cv_lib_stdcxx)
+
+# Check whether STL is libstdc++ with C++11 ABI
+check_cxx_source_compiles(
+	"
+	#include <vector>
+	int main() {
+	#if ! defined(_GLIBCXX_USE_CXX11_ABI) || ! _GLIBCXX_USE_CXX11_ABI
+		this is not libstdc++ using the C++11 ABI
+	#endif
+		return(0);
+	}
+	"
+USE_GLIBCXX_CXX11_ABI)
 
 check_cxx_source_compiles(
 	"
@@ -151,7 +166,13 @@ check_cxx_source_compiles(
 lyx_cv_prog_clang)
 
 set(USE_LLVM_LIBCPP)
-if(NOT STD_STRING_USES_COW)
+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)
@@ -177,7 +198,8 @@ if(LYX_USE_QT MATCHES "QT5")
   endif()
   if (Qt5WinExtras_FOUND)
     get_target_property(_winextra_prop Qt5::WinExtras IMPORTED_CONFIGURATIONS)
-    get_target_property(_winextra_link_libraries Qt5::WinExtras IMPORTED_LOCATION_${_winextra_prop})
+    string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE)
+    get_target_property(_winextra_link_libraries Qt5::WinExtras IMPORTED_LOCATION_${BUILD_TYPE})
     set(CMAKE_REQUIRED_LIBRARIES ${_winextra_link_libraries})
     set(CMAKE_REQUIRED_INCLUDES ${Qt5WinExtras_INCLUDE_DIRS})
     set(CMAKE_REQUIRED_FLAGS ${Qt5WinExtras_EXECUTABLE_COMPILE_FLAGS})