Title commands are fragile in memoir

[lyx.git] / development / cmake / ConfigureChecks.cmake

diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index 46d3f809b73e754ff280e72745380cee971bb230..f09ba8bd921c460d69d83f1d3d10f9664558009e 100644 (file)
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -12,6 +12,7 @@ include(CheckFunctionExists)
 include(CheckLibraryExists)
 include(CheckTypeSize)
 include(CheckCXXSourceCompiles)
+include(CheckCXXSourceRuns)
 include(MacroBoolTo01)
 include(TestBigEndian)
 
@@ -183,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)
@@ -197,7 +209,36 @@ else()
   endif()
 endif()
 
+set(QPA_XCB)
+set(HAVE_QT5_X11_EXTRAS)
 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 <${lyx_qt5_config}>
+    #include <string>
+    using namespace std;
+    string a(QT_QPA_DEFAULT_PLATFORM_NAME);
+    int main(int argc, char **argv)
+    {
+      if (a.compare(\"xcb\") == 0)
+       return(0);
+      else
+       return 1;
+    }
+    "
+    QT_USES_X11)
+  set(QPA_XCB ${QT_USES_X11})
+
   if (Qt5X11Extras_FOUND)
     get_target_property(_x11extra_prop Qt5::X11Extras IMPORTED_CONFIGURATIONS)
     get_target_property(_x11extra_link_libraries Qt5::X11Extras IMPORTED_LOCATION_${_x11extra_prop})
@@ -215,7 +256,9 @@ if(LYX_USE_QT MATCHES "QT5")
               bool isX11 = QX11Info::isPlatformX11();
             }
             "
-    QT_USES_X11)
+      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)