Some casing fixes

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

diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index ab9c820eb8f27d1fd6f9f10af0a5172865e9e8a0..0d0731101242047d97f1d15c8b21659f19f0ff57 100644 (file)
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -139,16 +139,24 @@ check_cxx_source_compiles(
        "
 STD_STRING_USES_COW)
 
-#get_filename_component(cxx_base "${CMAKE_CXX_COMPILER}" NAME_WE)
-#if(cxx_base MATCHES "^clang(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\+\\+)?$")
-#      set(STD_STRING_USES_COW)
-#else()
-#      if("${MINGW}")
-#              set(STD_STRING_USES_COW)
-#      else()
-#              set(STD_STRING_USES_COW 1)
-#      endif()
-#endif()
+check_cxx_source_compiles(
+       "
+       #ifndef __clang__
+               this is not clang
+       #endif
+       int main() {
+         return(0);
+       }
+       "
+lyx_cv_prog_clang)
+
+set(USE_LLVM_LIBCPP)
+if(NOT STD_STRING_USES_COW)
+  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)
@@ -167,6 +175,13 @@ if(LYX_USE_QT MATCHES "QT5")
             "
     QT_USES_X11)
   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})
+    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})