ia.po: repair 4 c-format errors

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

diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index 1c0215eecaab76dae6da098eb7d79b1a4a0fc7cf..6dc82a7d8788d75484792336cf3280da801de11d 100644 (file)
--- 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)
 
@@ -126,6 +128,57 @@ check_cxx_source_compiles(
        "
 LYX_CALLSTACK_PRINTING)
 
+# 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(
+       "
+       #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(
+       "
+       #ifndef __clang__
+               this is not clang
+       #endif
+       int main() {
+         return(0);
+       }
+       "
+lyx_cv_prog_clang)
+
+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()
+
 if(LYX_USE_QT MATCHES "QT5")
   if (Qt5X11Extras_FOUND)
     get_target_property(_x11extra_prop Qt5::X11Extras IMPORTED_CONFIGURATIONS)
@@ -143,6 +196,14 @@ if(LYX_USE_QT MATCHES "QT5")
             "
     QT_USES_X11)
   endif()
+  if (Qt5WinExtras_FOUND)
+    get_target_property(_winextra_prop Qt5::WinExtras IMPORTED_CONFIGURATIONS)
+    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})
+  endif()
 elseif(LYX_USE_QT MATCHES "QT4")
   set(CMAKE_REQUIRED_LIBRARIES ${QT_QTGUI_LIBRARY})
   set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES})