anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Comment the QtZlib workaround

Browse Source
This commit is contained in:
Scott Kostyshak 2022-12-18 16:12:08 -05:00
parent 8eb8a9d2fd
commit f9178fa278
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -834,6 +834,12 @@ if(LYX_USE_QT MATCHES "QT6|QT5")
if (LYX_USE_QT MATCHES "QT6")
get_target_property(QT_MOC_EXECUTABLE Qt6::moc LOCATION)
find_package(Qt6 COMPONENTS Core5Compat REQUIRED)
# We don't know why QtZlib is included, and ideally we
# would have a different fix than relying on this
# variable (which as "Private" in the name indicates,
# it might be a fragile workaround).
# See ML discussion here:
# 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})
include_directories(${Qt6Core5Compat_INCLUDE_DIRS})
set(QtCore5CompatLibrary Qt6::Core5Compat)