ctests: ignore Japanese dvi3 systemF tests

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

diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index 5550a7352b102a715300b6e416d14c9d1f0af2cf..06c9a445bad545f13296a7216a60f1874ce72f14 100644 (file)
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -68,7 +68,7 @@ check_type_size(intmax_t HAVE_INTMAX_T)
 macro_bool_to_01(HAVE_UINTMAX_T HAVE_STDINT_H_WITH_UINTMAX)
 
 check_type_size("long double"  HAVE_LONG_DOUBLE)
-check_type_size("long long"  HAVE_LONG_LONG)
+check_type_size("long long"  HAVE_LONG_LONG_INT)
 check_type_size(wchar_t HAVE_WCHAR_T)
 check_type_size(wint_t  HAVE_WINT_T)
 
@@ -77,7 +77,7 @@ if(HUNSPELL_FOUND)
   set(HunspellTestFile "${CMAKE_BINARY_DIR}/hunspelltest.cpp")
   file(WRITE "${HunspellTestFile}"
   "
-  #include <hunspell/hunspell.hxx>
+  #include <hunspell.hxx>
 
   int main()
   {
@@ -93,13 +93,13 @@ if(HUNSPELL_FOUND)
     "${HunspellTestFile}"
     CMAKE_FLAGS
       "-DINCLUDE_DIRECTORIES:STRING=${HUNSPELL_INCLUDE_DIR}"
-      "-DCMAKE_CXX_LINK_EXECUTABLE='${CMAKE_COMMAD} echo not linking now...'"
-  OUTPUT_VARIABLE  LOG2)
+    LINK_LIBRARIES ${HUNSPELL_LIBRARY}
+    OUTPUT_VARIABLE  LOG2)
 
   message(STATUS "HAVE_HUNSPELL_CXXABI = ${HAVE_HUNSPELL_CXXABI}")
   #message(STATUS "LOG2 = ${LOG2}")
-  if(LYX_EXTERNAL_HUNSPELL AND LYX_STDLIB_DEBUG AND HAVE_HUNSPELL_CXXABI)
-    message(WARNING "Compiling LyX with stdlib-debug and system hunspell libraries may lead to crashes. Consider using -DLYX_STDLIB_DEBUG=OFF or -DLYX_EXTERNAL_HUNSPELL=OFF.")
+  if(LYX_EXTERNAL_HUNSPELL AND (LYX_STDLIB_DEBUG OR LYX_DEBUG_GLIBC OR LYX_DEBUG_GLIBC_PEDANTIC) AND HAVE_HUNSPELL_CXXABI)
+    message(FATAL_ERROR "Compiling LyX with stdlib-debug and system hunspell libraries may lead to crashes. Consider using '-DLYX_STDLIB_DEBUG=OFF -DLYX_DEBUG_GLIBC=OFF -DLYX_DEBUG_GLIBC_PEDANTIC=OFF' or -DLYX_EXTERNAL_HUNSPELL=OFF.")
   endif()
 endif()
 
@@ -275,7 +275,7 @@ if(LYX_USE_QT MATCHES "QT5")
     set(lyx_qt5_config "QtCore/qconfig.h")
   endif()
   if(WIN32)
-    set(QT_USES_X11 CACHE "Win32 compiled without X11" 0)
+    set(QT_USES_X11 OFF CACHE BOOL "Win32 compiled without X11")
     # The try_run for minngw would not work here anyway
   else()
     check_cxx_source_runs(