v31.1-roots.1 · Commit 1: [PATCH 01/17] build(roots): establish v31 portability foundation
src/qt/CMakeLists.txt
Before: src/qt/CMakeLists.txt · After: src/qt/CMakeLists.txt
File metadata
index 58fa08b56ab90c2e038d9a2c9e515fefdef1b34b..5cd5e8e8cf66d1f184b5067cf2a29e5fa09a4829 100644
Download original patch · Release notes
Diff rows 1–82 of 82. Line numbers refer to the original before/after files.
+ Added− RemovedUnmarked lines are context.
Scroll the code area horizontally to read long lines. The two line-number columns refer to before and after.
src/qt/CMakeLists.txt
CHANGED
|
@@ -11,19 +11,27 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
|
|
11
11
|
string(APPEND CMAKE_OBJCXX_COMPILE_OBJECT " ${APPEND_CPPFLAGS} ${APPEND_CXXFLAGS}")
|
|
12
12
|
endif()
|
|
13
13
|
|
|
14
|
-
get_target_property(qt_lib_type Qt6::Core TYPE)
|
|
14
|
+
get_target_property(qt_lib_type Qt${WITH_QT_VERSION}::Core TYPE)
|
|
15
|
+
if(qt_lib_type STREQUAL "STATIC_LIBRARY" AND NOT COMMAND qt${WITH_QT_VERSION}_import_plugins)
|
|
16
|
+
message(FATAL_ERROR "Static Qt requires the import_plugins CMake command (Qt 5.14 or newer for Qt 5).")
|
|
17
|
+
endif()
|
|
15
18
|
|
|
16
19
|
function(import_plugins target)
|
|
17
20
|
if(qt_lib_type STREQUAL "STATIC_LIBRARY")
|
|
18
|
-
set(plugins Qt6::QMinimalIntegrationPlugin)
|
|
21
|
+
set(plugins Qt${WITH_QT_VERSION}::QMinimalIntegrationPlugin)
|
|
19
22
|
if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|FreeBSD)$")
|
|
20
|
-
list(APPEND plugins Qt6::QXcbIntegrationPlugin)
|
|
23
|
+
list(APPEND plugins Qt${WITH_QT_VERSION}::QXcbIntegrationPlugin)
|
|
21
24
|
elseif(WIN32)
|
|
22
|
-
list(APPEND plugins Qt6::QWindowsIntegrationPlugin Qt6::QModernWindowsStylePlugin)
|
|
25
|
+
list(APPEND plugins Qt${WITH_QT_VERSION}::QWindowsIntegrationPlugin)
|
|
26
|
+
if(WITH_QT_VERSION STREQUAL "5")
|
|
27
|
+
list(APPEND plugins Qt5::QWindowsVistaStylePlugin)
|
|
28
|
+
else()
|
|
29
|
+
list(APPEND plugins Qt6::QModernWindowsStylePlugin)
|
|
30
|
+
endif()
|
|
23
31
|
elseif(APPLE)
|
|
24
|
-
list(APPEND plugins Qt6::QCocoaIntegrationPlugin Qt6::QMacStylePlugin)
|
|
32
|
+
list(APPEND plugins Qt${WITH_QT_VERSION}::QCocoaIntegrationPlugin Qt${WITH_QT_VERSION}::QMacStylePlugin)
|
|
25
33
|
endif()
|
|
26
|
-
qt6_import_plugins(${target}
|
|
34
|
+
cmake_language(CALL qt${WITH_QT_VERSION}_import_plugins ${target}
|
|
27
35
|
INCLUDE ${plugins}
|
|
28
36
|
EXCLUDE_BY_TYPE
|
|
29
37
|
accessiblebridge
|
|
@@ -55,8 +63,8 @@ set(CMAKE_AUTOUIC_SEARCH_PATHS forms)
|
|
|
55
63
|
|
|
56
64
|
set(CMAKE_AUTORCC OFF)
|
|
57
65
|
configure_file(bitcoin_locale.qrc bitcoin_locale.qrc USE_SOURCE_PERMISSIONS COPYONLY)
|
|
58
|
-
qt6_add_resources(BITCOIN_QRC bitcoin.qrc)
|
|
59
|
-
qt6_add_resources(BITCOIN_LOCALE_QRC ${CMAKE_CURRENT_BINARY_DIR}/bitcoin_locale.qrc)
|
|
66
|
+
cmake_language(CALL qt${WITH_QT_VERSION}_add_resources BITCOIN_QRC bitcoin.qrc)
|
|
67
|
+
cmake_language(CALL qt${WITH_QT_VERSION}_add_resources BITCOIN_LOCALE_QRC ${CMAKE_CURRENT_BINARY_DIR}/bitcoin_locale.qrc)
|
|
60
68
|
# See: https://bugreports.qt.io/browse/QTBUG-141858.
|
|
61
69
|
get_target_property(warn_flags warn_interface INTERFACE_COMPILE_OPTIONS)
|
|
62
70
|
if("-Wtrailing-whitespace=any" IN_LIST warn_flags)
|
|
@@ -145,7 +153,7 @@ set_property(SOURCE macnotificationhandler.mm
|
|
|
145
153
|
)
|
|
146
154
|
target_link_libraries(bitcoinqt
|
|
147
155
|
PUBLIC
|
|
148
|
-
Qt6::Widgets
|
|
156
|
+
Qt${WITH_QT_VERSION}::Widgets
|
|
149
157
|
PRIVATE
|
|
150
158
|
core_interface
|
|
151
159
|
bitcoin_cli
|
|
@@ -223,18 +231,18 @@ if(ENABLE_WALLET)
|
|
|
223
231
|
target_link_libraries(bitcoinqt
|
|
224
232
|
PRIVATE
|
|
225
233
|
bitcoin_wallet
|
|
226
|
-
Qt6::Network
|
|
234
|
+
Qt${WITH_QT_VERSION}::Network
|
|
227
235
|
)
|
|
228
236
|
endif()
|
|
229
237
|
|
|
230
238
|
if(WITH_DBUS)
|
|
231
|
-
target_link_libraries(bitcoinqt PRIVATE Qt6::DBus)
|
|
239
|
+
target_link_libraries(bitcoinqt PRIVATE Qt${WITH_QT_VERSION}::DBus)
|
|
232
240
|
endif()
|
|
233
241
|
|
|
234
242
|
if(qt_lib_type STREQUAL "STATIC_LIBRARY")
|
|
235
243
|
# We want to define static plugins to link ourselves, thus preventing
|
|
236
244
|
# automatic linking against a "sane" set of default static plugins.
|
|
237
|
-
qt6_import_plugins(bitcoinqt
|
|
245
|
+
cmake_language(CALL qt${WITH_QT_VERSION}_import_plugins bitcoinqt
|
|
238
246
|
EXCLUDE_BY_TYPE
|
|
239
247
|
accessiblebridge
|
|
240
248
|
platforms
|
|
@@ -306,8 +314,8 @@ else()
|
|
|
306
314
|
add_custom_target(translate COMMAND ${CMAKE_COMMAND}
|
|
307
315
|
-D "PROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR}"
|
|
308
316
|
-D "COPYRIGHT_HOLDERS=${COPYRIGHT_HOLDERS}"
|
|
309
|
-
-D "LCONVERT_EXECUTABLE=$<TARGET_FILE:Qt6::lconvert>"
|
|
310
|
-
-D "LUPDATE_EXECUTABLE=$<TARGET_FILE:Qt6::lupdate>"
|
|
317
|
+
-D "LCONVERT_EXECUTABLE=$<TARGET_FILE:Qt${WITH_QT_VERSION}::lconvert>"
|
|
318
|
+
-D "LUPDATE_EXECUTABLE=$<TARGET_FILE:Qt${WITH_QT_VERSION}::lupdate>"
|
|
311
319
|
-D "XGETTEXT_EXECUTABLE=${XGETTEXT_EXECUTABLE}"
|
|
312
320
|
-P ${PROJECT_SOURCE_DIR}/share/qt/translate.cmake
|
|
313
321
|
)
|