anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Amend 263da2fa and 88c1ed9e for CMake-build

Browse Source
This commit is contained in:
Kornel Benko 2023-03-03 10:57:12 +01:00
parent 263da2fa20
commit 6251afec70
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -833,7 +833,7 @@ if(LYX_USE_QT MATCHES "QT6|QT5")
endif() endif()
if (LYX_USE_QT MATCHES "QT6") if (LYX_USE_QT MATCHES "QT6")
get_target_property(QT_MOC_EXECUTABLE Qt6::moc LOCATION) get_target_property(QT_MOC_EXECUTABLE Qt6::moc LOCATION)
find_package(Qt6 COMPONENTS Core5Compat REQUIRED) #find_package(Qt6 COMPONENTS Core5Compat REQUIRED)
# We don't know why QtZlib is included, and ideally we # We don't know why QtZlib is included, and ideally we
# would have a different fix than relying on this # would have a different fix than relying on this
# variable (which as "Private" in the name indicates, # variable (which as "Private" in the name indicates,
@ -842,8 +842,8 @@ if(LYX_USE_QT MATCHES "QT6|QT5")
# https://www.mail-archive.com/search?l=mid&q=CAGU9VOqpkngYBumnNh%3DcuzQ585GsS7TJbhHa903nJSfy-davRg%40mail.gmail.com # https://www.mail-archive.com/search?l=mid&q=CAGU9VOqpkngYBumnNh%3DcuzQ585GsS7TJbhHa903nJSfy-davRg%40mail.gmail.com
list(REMOVE_ITEM Qt6Core5Compat_INCLUDE_DIRS ${_Qt6ZlibPrivate_OWN_INCLUDE_DIRS}) list(REMOVE_ITEM Qt6Core5Compat_INCLUDE_DIRS ${_Qt6ZlibPrivate_OWN_INCLUDE_DIRS})
include_directories(${Qt6Core5Compat_INCLUDE_DIRS}) include_directories(${Qt6Core5Compat_INCLUDE_DIRS})
set(QtCore5CompatLibrary Qt6::Core5Compat) #set(QtCore5CompatLibrary Qt6::Core5Compat)
set(QtCore5CompatModule Core5Compat) #set(QtCore5CompatModule Core5Compat)
endif() endif()
endif() endif()
else() else()