]> git.lyx.org Git - lyx.git/commitdiff
Comment the QtZlib workaround
authorScott Kostyshak <skostysh@lyx.org>
Sun, 18 Dec 2022 21:12:08 +0000 (16:12 -0500)
committerScott Kostyshak <skostysh@lyx.org>
Sun, 18 Dec 2022 21:12:08 +0000 (16:12 -0500)
CMakeLists.txt

index d2435b81be1579263be6bb2aeae47360a6e8a963..146556c9027159e9e364abefba304c472d1c1936 100644 (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)