Am Tue, 16 Mar 2021 18:21:19 +0100 schrieb Yu Jin <yu_...@lyx.org>: > Am Di., 16. März 2021 um 16:36 Uhr schrieb Kornel Benko <kor...@lyx.org>: > > > Am Tue, 16 Mar 2021 16:32:49 +0100 > > schrieb Yu Jin <yu_...@lyx.org>: > > > > > Just seen this one and wanted to try it out obviously :) > > > But it doesn't work for me on Windows. Using CMake GUI I notice that the > > > dropdown menu LYX_USE_QT does not contain QT6, just QT5, QT4 and AUTO as > > > before. When I choose AUTO it fails with: > > > > > > CMake Error at development/cmake/modules/FindQt4.cmake:568 (message): > > > Could NOT find QtCore. Check > > > C:/lyx/masterbuild64Qt6/CMakeFiles/CMakeError.log for more details. > > > Call Stack (most recent call first): > > > CMakeLists.txt:804 (find_package) > > > > > > It does find some QT6 stuff correctly though, like QT_PLUGINS_DIR, but > > not > > > everything, like QtCore. > > > > I have a patch ready, but cannot test. > > > > Care to share it? I can test.
Attached.
Kornel
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8ca0c10fd..b1ee3ab5b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -217,11 +217,11 @@ else()
unset(LYX_ENABLE_VALGRIND_TESTS CACHE)
endif()
endif()
LYX_OPTION(ASAN "Use address sanitizer" OFF ALL)
#LYX_COMBO(USE_FILEDIALOG "Use native or QT file dialog" QT NATIVE)
-LYX_COMBO(USE_QT "Use Qt version as frontend" AUTO QT4 QT5)
+LYX_COMBO(USE_QT "Use Qt version as frontend" AUTO QT4 QT5 QT6)
LYX_COMBO(USE_IPO "Interprocedural optimization" OFF AUTO ON)
#LYX_OPTION(3RDPARTY_BUILD "Build 3rdparty libs" OFF ALL)
LYX_OPTION(DISABLE_CALLSTACK_PRINTING "do not print a callstack when crashing" OFF ALL)
LYX_OPTION(EXTERNAL_Z "OFF := Build 3rdparty lib zlib" ${DefaultExternalLibs} ALL)
LYX_OPTION(EXTERNAL_DTL "OFF := Build 3rdparty commands dt2dv and dv2dt" ${DefaultExternalLibs} ALL)
@@ -741,36 +741,59 @@ if(LYX_XMINGW)
list(APPEND CMAKE_FIND_ROOT_PATH ${GNUWIN32_DIR})
endif()
set(min_qt5_version "5.6")
if(LYX_USE_QT MATCHES "AUTO")
- # try qt5 first
- find_package(Qt5Core CONFIG QUIET)
- if(Qt5Core_FOUND)
- set(LYX_USE_QT "QT5" CACHE STRING "Valid qt version" FORCE)
+ # try qt6 first
+ find_package(Qt6Core CONFIG QUIET)
+ if (Qt6Core_Found)
+ set(LYX_USE_QT "QT6" CACHE STRING "Valid qt version" FORCE)
message(STATUS "Qt5Core_VERSION = ${Qt5Core_VERSION}")
- if(Qt5Core_VERSION VERSION_LESS ${min_qt5_version})
- find_package(Qt4 "4.5.0" QUIET)
- if(QT4_FOUND)
- set(LYX_USE_QT "QT4" CACHE STRING "Valid qt version" FORCE)
- endif()
- endif()
else()
- set(LYX_USE_QT "QT4" CACHE STRING "Valid qt version" FORCE)
+ find_package(Qt5Core CONFIG QUIET)
+ if(Qt5Core_FOUND)
+ set(LYX_USE_QT "QT5" CACHE STRING "Valid qt version" FORCE)
+ message(STATUS "Qt5Core_VERSION = ${Qt5Core_VERSION}")
+ if(Qt5Core_VERSION VERSION_LESS ${min_qt5_version})
+ find_package(Qt4 "4.5.0" QUIET)
+ if(QT4_FOUND)
+ set(LYX_USE_QT "QT4" CACHE STRING "Valid qt version" FORCE)
+ endif()
+ endif()
+ else()
+ set(LYX_USE_QT "QT4" CACHE STRING "Valid qt version" FORCE)
+ endif()
endif()
endif()
-if(LYX_USE_QT MATCHES "QT5")
+if(LYX_USE_QT MATCHES "QT6|QT5")
+ if (LYX_USE_QT MATCHES "QT6")
+ set(QtVal "Qt6")
+ macro (qt_add_resources)
+ Qt6_add_resources(${ARGN})
+ endmacro()
+ macro (qt_wrap_uifiles)
+ Qt6_wrap_ui(${ARGN})
+ endmacro()
+ else()
+ set(QtVal "Qt5")
+ macro (qt_add_resources)
+ Qt5_add_resources(${ARGN})
+ endmacro()
+ macro (qt_wrap_uifiles)
+ Qt5_wrap_ui(${ARGN})
+ endmacro()
+ endif()
# set QPA_XCB if QT uses X11
- find_package(Qt5Core CONFIG REQUIRED)
- if (Qt5Core_FOUND)
- find_package(Qt5Widgets CONFIG REQUIRED)
+ find_package(${QtVal}Core CONFIG REQUIRED)
+ if (${QtVal}Core_FOUND)
+ find_package(${QtVal}Widgets CONFIG REQUIRED)
if(APPLE)
- find_package(Qt5MacExtras CONFIG REQUIRED)
+ find_package(${QtVal}MacExtras CONFIG REQUIRED)
endif()
- find_package(Qt5X11Extras CONFIG QUIET)
- find_package(Qt5WinExtras CONFIG QUIET)
- set(QTVERSION ${Qt5Core_VERSION})
+ find_package(${QtVal}X11Extras CONFIG QUIET)
+ find_package(${QtVal}WinExtras CONFIG QUIET)
+ set(QTVERSION ${${QtVal}Core_VERSION})
if (QTVERSION VERSION_LESS ${min_qt5_version})
message(STATUS "QTVERSION = \"${QTVERSION}\"")
message(STATUS "This version is not recommended, try either option -DLYX_USE_QT=QT4 or")
message(STATUS "install QT-Version >= \"${min_qt5_version}\"")
# see thread in lyx-devel list
@@ -779,23 +802,20 @@ if(LYX_USE_QT MATCHES "QT5")
# Subject: cmake compilation error
#message(FATAL_ERROR "Wrong Qt-Version")
endif()
macro (qt_use_modules lyxtarget)
foreach (_tg ${ARGN})
- find_package(Qt5${_tg} CONFIG REQUIRED)
- target_link_libraries(${lyxtarget} Qt5::${_tg})
+ find_package(${QtVal}${_tg} CONFIG REQUIRED)
+ target_link_libraries(${lyxtarget} ${QtVal}::${_tg})
endforeach()
endmacro()
- macro (qt_add_resources)
- qt5_add_resources(${ARGN})
- endmacro()
- macro (qt_wrap_uifiles)
- qt5_wrap_ui(${ARGN})
- endmacro()
message(STATUS "Found Qt-Version ${QTVERSION}")
if(WIN32)
- set(LYX_QTMAIN_LIBRARY ${Qt5Core_QTMAIN_LIBRARIES})
+ set(LYX_QTMAIN_LIBRARY ${${QtVal}Core_QTMAIN_LIBRARIES})
+ endif()
+ if (LYX_USE_QT MATCHES "QT6")
+ get_target_property(QT_MOC_EXECUTABLE Qt6::moc LOCATION)
endif()
endif()
elseif(LYX_USE_QT MATCHES "QT4")
if(LYX_XMINGW)
set(QT_MINGW_DIR ${LYX_QT4} CACHE PATH "Qt for Mingw" FORCE)
@@ -1164,10 +1184,23 @@ else ()
set (cmd ${cmd} -C ${CMAKE_BUILD_TYPE})
endif ()
add_custom_target (lyx_run_tests COMMAND ${cmd})
set_target_properties(lyx_run_tests PROPERTIES FOLDER "tests")
+find_package(Java 1.8)
+if (Java_FOUND)
+ include(UseJava)
+ message(STATUS "Search for saxon.jar")
+ # search for saxon.jar ->
+ find_jar(LYXSAXONJAR saxon)
+ if (LYXSAXONJAR)
+ message(STATUS "Found saxon.jar at ${LYXSAXONJAR}")
+ else()
+ message(STATUS "LYXSAXONJAR = ${LYXSAXONJAR}")
+ endif()
+endif()
+
if(LYX_INSTALL)
if(${LYX_PYTHON_EXECUTABLE} MATCHES "-NOTFOUND")
message(STATUS "Python required to create doc!")
else()
if(UNIX)
diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index 616bec0a10..29ad935c65 100644
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -275,15 +275,20 @@ else()
endif()
endif()
set(QPA_XCB)
set(HAVE_QT5_X11_EXTRAS)
-if(LYX_USE_QT MATCHES "QT5")
-
+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 ${Qt5Core_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")
else()
set(lyx_qt5_config "QtCore/qconfig.h")
@@ -310,18 +315,18 @@ if(LYX_USE_QT MATCHES "QT5")
if(QT_USES_X11)
set(QPA_XCB ${QT_USES_X11})
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(
"
#include <QtX11Extras/QX11Info>
int main()
@@ -331,17 +336,17 @@ 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})
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(
diff --git a/development/cmake/LyxPackaging.cmake b/development/cmake/LyxPackaging.cmake
index cfd1c5c8e2..6d308d06d9 100644
--- a/development/cmake/LyxPackaging.cmake
+++ b/development/cmake/LyxPackaging.cmake
@@ -152,11 +152,11 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${LYX_PROJECT}-${LYX_INSTALL_SUFFIX}")
# We depend on python scripting
# Currently no need to specify versions for pythonx since they are only
# available in newest distributions.
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python (>= 2.7) | python3 | python2")
-set(CPACK_DEBIAN_PACKAGE_SECTION "editors")
+set(CPACK_DEBIAN_PACKAGE_SECTION "universe/editors")
# use dpkg-shlibdeps to generate additional info for package dependency list.
set(CPACK_DEBIAN_PACKAGE_RELEASE ${LYX_PACKAGE_RELEASE})
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
set(CPACK_DEBIAN_PACKAGE_DEBUG ON)
pgp1D4IUKqpch.pgp
Description: Digitale Signatur von OpenPGP
-- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
