Fixup dcef1a9c: better handling of front-of-string splitting

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a9c428d4a48c838f9e9cd61fab59c46a330b1b3..146556c9027159e9e364abefba304c472d1c1936 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -834,6 +834,13 @@ 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)
                        set(QtCore5CompatModule Core5Compat)