X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2FConfigureChecks.cmake;h=9062372c38e107156a7e561bce340045b0cd53e0;hb=1a800bf3e502a3072bd41aafdb7a74726bdeb880;hp=06c9a445bad545f13296a7216a60f1874ce72f14;hpb=40e071c7cb6206ab98328eb4e685e698a1e05af1;p=lyx.git

diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index 06c9a445ba..9062372c38 100644
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -88,6 +88,9 @@ if(HUNSPELL_FOUND)
   "
   )
 
+# The trick with faking the link command (see the else block) does not work
+# with XCode (350a9daf).
+if(APPLE OR LYX_EXTERNAL_HUNSPELL)
   try_compile(HAVE_HUNSPELL_CXXABI
     "${CMAKE_BINARY_DIR}"
     "${HunspellTestFile}"
@@ -95,6 +98,17 @@ if(HUNSPELL_FOUND)
       "-DINCLUDE_DIRECTORIES:STRING=${HUNSPELL_INCLUDE_DIR}"
     LINK_LIBRARIES ${HUNSPELL_LIBRARY}
     OUTPUT_VARIABLE  LOG2)
+else()
+  try_compile(HAVE_HUNSPELL_CXXABI
+    "${CMAKE_BINARY_DIR}"
+    "${HunspellTestFile}"
+    CMAKE_FLAGS
+      "-DINCLUDE_DIRECTORIES:STRING=${HUNSPELL_INCLUDE_DIR}"
+      # At this point, ../lib/libhunspell.a has not been built so we
+      # cannot complete the linking.
+      "-DCMAKE_CXX_LINK_EXECUTABLE='${CMAKE_COMMAD} echo dummy (fake) link command since libhunspell.a not built yet.'"
+    OUTPUT_VARIABLE  LOG2)
+endif()
 
   message(STATUS "HAVE_HUNSPELL_CXXABI = ${HAVE_HUNSPELL_CXXABI}")
   #message(STATUS "LOG2 = ${LOG2}")
@@ -263,16 +277,21 @@ endif()
 
 set(QPA_XCB)
 set(HAVE_QT5_X11_EXTRAS)
-if(LYX_USE_QT MATCHES "QT5")
-
-  set(CMAKE_REQUIRED_INCLUDES ${Qt5Core_INCLUDE_DIRS})
+set(HAVE_QT6_X11_EXTRAS)
+if (LYX_USE_QT MATCHES "QT5|QT6")
+  if (LYX_USE_QT MATCHES "QT5")
+    set(QtVal Qt5)
+  else()
+    set(QtVal Qt6)
+  endif()
+  set(CMAKE_REQUIRED_INCLUDES ${${QtVal}Core_INCLUDE_DIRS})
   set(CMAKE_REQUIRED_FLAGS)
-  #message(STATUS "Qt5Core_INCLUDE_DIRS = ${Qt5Core_INCLUDE_DIRS}")
+  #message(STATUS "${QtVal}Core_INCLUDE_DIRS = ${${QtVal}Core_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")
+    set(lyx_qt_config "QtGui/qtgui-config.h")
   else()
-    set(lyx_qt5_config "QtCore/qconfig.h")
+    set(lyx_qt_config "QtCore/qconfig.h")
   endif()
   if(WIN32)
     set(QT_USES_X11 OFF CACHE BOOL "Win32 compiled without X11")
@@ -280,7 +299,7 @@ if(LYX_USE_QT MATCHES "QT5")
   else()
     check_cxx_source_runs(
       "
-      #include <${lyx_qt5_config}>
+      #include <${lyx_qt_config}>
       #include <string>
       using namespace std;
       string a(QT_QPA_DEFAULT_PLATFORM_NAME);
@@ -293,19 +312,20 @@ if(LYX_USE_QT MATCHES "QT5")
       }
       "
       QT_USES_X11)
-    if(QT_USES_X11)
+    if(QT_USES_X11 AND NOT LYX_USE_QT MATCHES "QT6")
       set(QPA_XCB ${QT_USES_X11})
+      message(STATUS "Found QPA_XCB = ${QPA_XCB}")
     endif()
   endif()
 
-  if (Qt5X11Extras_FOUND)
-    get_target_property(_x11extra_prop Qt5::X11Extras IMPORTED_CONFIGURATIONS)
-    get_target_property(_x11extra_link_libraries Qt5::X11Extras IMPORTED_LOCATION_${_x11extra_prop})
+  if (${QtVal}X11Extras_FOUND)
+    get_target_property(_x11extra_prop ${QtVal}::X11Extras IMPORTED_CONFIGURATIONS)
+    get_target_property(_x11extra_link_libraries ${QtVal}::X11Extras IMPORTED_LOCATION_${_x11extra_prop})
     set(CMAKE_REQUIRED_LIBRARIES ${_x11extra_link_libraries})
-    set(CMAKE_REQUIRED_INCLUDES ${Qt5X11Extras_INCLUDE_DIRS})
-    set(CMAKE_REQUIRED_FLAGS "${Qt5X11Extras_EXECUTABLE_COMPILE_FLAGS} -fPIC -DQT_NO_VERSION_TAGGING")
+    set(CMAKE_REQUIRED_INCLUDES ${${QtVal}X11Extras_INCLUDE_DIRS})
+    set(CMAKE_REQUIRED_FLAGS "${${QtVal}X11Extras_EXECUTABLE_COMPILE_FLAGS} -fPIC -DQT_NO_VERSION_TAGGING")
     #message(STATUS "CMAKE_REQUIRED_LIBRARIES = ${_x11extra_link_libraries}")
-    #message(STATUS "CMAKE_REQUIRED_INCLUDES = ${Qt5X11Extras_INCLUDE_DIRS}")
+    #message(STATUS "CMAKE_REQUIRED_INCLUDES = ${${QtVal}X11Extras_INCLUDE_DIRS}")
     #message(STATUS "CMAKE_REQUIRED_FLAGS = ${CMAKE_REQUIRED_FLAGS}")
     check_cxx_source_compiles(
             "
@@ -316,30 +336,18 @@ if(LYX_USE_QT MATCHES "QT5")
             }
             "
       QT_HAS_X11_EXTRAS)
-    set(HAVE_QT5_X11_EXTRAS ${QT_HAS_X11_EXTRAS})
-    set(LYX_QT5_X11_EXTRAS_LIBRARY ${_x11extra_link_libraries})
+    string(TOUPPER ${QtVal} QTVAL)
+    set(HAVE_${QTVAL}_X11_EXTRAS ${QT_HAS_X11_EXTRAS})
+    set(LYX_${QTVAL}_X11_EXTRAS_LIBRARY ${_x11extra_link_libraries})
   endif()
-  if (Qt5WinExtras_FOUND)
-    get_target_property(_winextra_prop Qt5::WinExtras IMPORTED_CONFIGURATIONS)
+  if (${QtVal}WinExtras_FOUND)
+    get_target_property(_winextra_prop ${QtVal}::WinExtras IMPORTED_CONFIGURATIONS)
     string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE)
-    get_target_property(_winextra_link_libraries Qt5::WinExtras IMPORTED_LOCATION_${BUILD_TYPE})
+    get_target_property(_winextra_link_libraries ${QtVal}::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})
+    set(CMAKE_REQUIRED_INCLUDES ${${QtVal}WinExtras_INCLUDE_DIRS})
+    set(CMAKE_REQUIRED_FLAGS ${${QtVal}WinExtras_EXECUTABLE_COMPILE_FLAGS})
   endif()
-elseif(LYX_USE_QT MATCHES "QT4")
-  set(CMAKE_REQUIRED_LIBRARIES ${QT_QTGUI_LIBRARY})
-  set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES})
-  check_cxx_source_compiles(
-          "
-          #include <QtGui/QX11Info>
-          int main()
-          {
-            QX11Info *qxi = new QX11Info;
-            qxi->~QX11Info();
-          }
-          "
-  QT_USES_X11)
 else()
   message(FATAL_ERROR "Check for QT_USES_X11: Not handled LYX_USE_QT (= ${LYX_USE_QT})")
 endif()