X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2FConfigureChecks.cmake;h=f09ba8bd921c460d69d83f1d3d10f9664558009e;hb=6461d6aa1b01a97814020020e260c34c117a2631;hp=c9c7b74b87a4f2b43dd0c9795af1bb37c3a98917;hpb=cb0c881b0298ef6c54e0cc57dc6f2ef46716c7aa;p=lyx.git

diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index c9c7b74b87..f09ba8bd92 100644
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -184,6 +184,17 @@ check_cxx_source_compiles(
   "
 HAVE_DEF_MAKE_UNIQUE)
 
+check_cxx_source_compiles(
+  "
+  #include <mutex>
+  static std::once_flag flag;
+  int main() {
+    std::call_once(flag, [](){ return; });
+    return(0);
+  }
+  "
+LYX_USE_STD_CALL_ONCE)
+
 set(USE_LLVM_LIBCPP)
 set(STD_STRING_USES_COW)
 set(USE_GLIBCXX_CXX11_ABI)
@@ -205,9 +216,15 @@ if(LYX_USE_QT MATCHES "QT5")
   set(CMAKE_REQUIRED_INCLUDES ${Qt5Core_INCLUDE_DIRS})
   set(CMAKE_REQUIRED_FLAGS)
   #message(STATUS "Qt5Core_INCLUDE_DIRS = ${Qt5Core_INCLUDE_DIRS}")
+  check_include_file_cxx(QtGui/qtgui-config.h HAVE_QTGUI_CONFIG_H)
+  if (HAVE_QTGUI_CONFIG_H)
+    set(lyx_qt5_config "QtGui/qtgui-config.h")
+  else()
+    set(lyx_qt5_config "QtCore/qconfig.h")
+  endif()
   check_cxx_source_runs(
     "
-    #include <QtCore/qconfig.h>
+    #include <${lyx_qt5_config}>
     #include <string>
     using namespace std;
     string a(QT_QPA_DEFAULT_PLATFORM_NAME);
@@ -241,6 +258,7 @@ if(LYX_USE_QT MATCHES "QT5")
             "
       QT_HAS_X11_EXTRAS)
     set(HAVE_QT5_X11_EXTRAS ${QT_HAS_X11_EXTRAS})
+    set(LYX_QT5_X11_EXTRAS_LIBRARY ${_x11extra_link_libraries})
   endif()
   if (Qt5WinExtras_FOUND)
     get_target_property(_winextra_prop Qt5::WinExtras IMPORTED_CONFIGURATIONS)