blob: 8474226f40c6863a792234f50cc38b7873c21666 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
Fix detection of zstd.
CMake Error at /usr/local/lib/cmake/zstd/zstdTargets.cmake:42 (message):
Some (but not all) targets in this export set were already defined.
Targets Defined: zstd::libzstd_shared
Targets not yet defined: zstd::libzstd_static
Call Stack (most recent call first):
/usr/local/lib/cmake/zstd/zstdConfig.cmake:1 (include)
/usr/local/lib/cmake/Qt6/FindWrapZSTD.cmake:24 (find_package)
/usr/local/lib/cmake/Qt6/QtFindPackageHelpers.cmake:156 (find_package)
src/designer/src/lib/CMakeLists.txt:415 (qt_find_package)
Regressed by: https://code.qt.io/cgit/qt/qttools.git/commit/?h=6.6.0&id=ff5c080c2eb9267c43da6fafe953bf50076443c4
--- configure.cmake.orig 2025-09-25 00:29:00 UTC
+++ configure.cmake
@@ -4,6 +4,11 @@ include(${CMAKE_CURRENT_LIST_DIR}/src/qdoc/cmake/QDocC
# Include QDoc-specific configuration early (needed for feature definitions)
include(${CMAKE_CURRENT_LIST_DIR}/src/qdoc/cmake/QDocConfiguration.cmake)
+#### Libraries
+
+qt_find_package(WrapZSTD 1.3 PROVIDED_TARGETS WrapZSTD::WrapZSTD MODULE_NAME designer)
+
+
#### Tests
qt_find_package(WrapLibClang 8 PROVIDED_TARGETS WrapLibClang::WrapLibClang)
@@ -11,7 +16,6 @@ endif()
if(TARGET WrapLibClang::WrapLibClang)
set(TEST_libclang "ON" CACHE BOOL "Required libclang version found." FORCE)
endif()
-
#### Features
|
