Cmake build: Amend 41e409f8: Use std::call_once only if it is actually available

diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index 146330a56a0b3be4be402ea8aab6f09cdb13b491..61190c8655a2389a63d207c1c5a1048cd103be62 100644 (file)
--- 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)

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 95148b61e789742eb543a94d51f02f31964f0fb4..dbd2c83bc7ab5c9d95466e28cf4c1ad7146d4e85 100644 (file)
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -91,6 +91,9 @@ ${Include_used_spellchecker}
 
 #cmakedefine HAVE_DEF_MAKE_UNIQUE 1
 
+// Define to 1 if std::call_once is supported by the compiler
+#cmakedefine LYX_USE_STD_CALL_ONCE 1
+
 #endif // config.h guard