v30.3-roots.1 · Commit 7: [PATCH 07/68] build: adapt Roots maintenance and assurance to Core 30.3
src/qt/CMakeLists.txt
Before: src/qt/CMakeLists.txt · After: src/qt/CMakeLists.txt
File metadata
index 2bf931d191d0bf7f10f7e46e36f54edad8f51253..5e1c48f6d8daf69d5227d465a6aae10323798fbf 100644
Download original patch · Release notes
Diff rows 1–92 of 92. Line numbers refer to the original before/after files.
+ Added− RemovedUnmarked lines are context.
Scroll the code area horizontally to read long lines. Before is on the left; after is on the right. Unified view fits narrow screens more easily.
src/qt/CMakeLists.txt
CHANGED
|
@@ -59,67 +59,8 @@ set(CMAKE_AUTORCC ON)
|
|
| 59 |
set(CMAKE_AUTOUIC ON)
|
| 60 |
set(CMAKE_AUTOUIC_SEARCH_PATHS forms)
|
| 61 |
|
| 62 |
-
set(ICON_PATH "res/rendered_icons")
|
| 63 |
-
set(ICO_SPECS
|
| 64 |
-
256 64 48 32 24 20 16
|
| 65 |
-
)
|
| 66 |
-
set(ICNS_SPECS
|
| 67 |
-
1024
|
| 68 |
-
)
|
| 69 |
-
set(bitcoin_svg "res/src/bitcoinroots-logo.svg")
|
| 70 |
-
|
| 71 |
-
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${ICON_PATH}")
|
| 72 |
-
foreach(size IN LISTS ICO_SPECS ICNS_SPECS)
|
| 73 |
-
set(png "${ICON_PATH}/bitcoin${size}.png")
|
| 74 |
-
add_custom_command(
|
| 75 |
-
OUTPUT "${png}"
|
| 76 |
-
COMMAND "${RSVG_CONVERT}" -f png -d ${size} -p ${size} --output "${png}" "${CMAKE_CURRENT_SOURCE_DIR}/${bitcoin_svg}"
|
| 77 |
-
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${bitcoin_svg}"
|
| 78 |
-
COMMENT "Generating ${png} from ${bitcoin_svg}"
|
| 79 |
-
VERBATIM
|
| 80 |
-
)
|
| 81 |
-
endforeach()
|
| 82 |
-
|
| 83 |
-
set(bitcoin_icns "${ICON_PATH}/bitcoin.icns")
|
| 84 |
-
add_custom_command(
|
| 85 |
-
OUTPUT "${bitcoin_icns}"
|
| 86 |
-
COMMAND "${PNG2ICNS}" "${bitcoin_icns}" "${ICON_PATH}/bitcoin1024.png"
|
| 87 |
-
DEPENDS "${ICON_PATH}/bitcoin1024.png"
|
| 88 |
-
COMMENT "Generating ${bitcoin_icns} from the Roots icon"
|
| 89 |
-
VERBATIM
|
| 90 |
-
)
|
| 91 |
-
add_custom_target(generate_icns DEPENDS "${bitcoin_icns}")
|
| 92 |
-
|
| 93 |
-
set(bitcoin_ico "${ICON_PATH}/bitcoin.ico")
|
| 94 |
-
set(testnet_ico "${ICON_PATH}/bitcoin_testnet.ico")
|
| 95 |
-
add_custom_command(
|
| 96 |
-
OUTPUT "${bitcoin_ico}"
|
| 97 |
-
COMMAND "${IMAGEMAGICK_CONVERT}" ${ICON_PATH}/bitcoin256.png ${ICON_PATH}/bitcoin64.png ${ICON_PATH}/bitcoin48.png ${ICON_PATH}/bitcoin32.png ${ICON_PATH}/bitcoin24.png ${ICON_PATH}/bitcoin20.png ${ICON_PATH}/bitcoin16.png "${bitcoin_ico}"
|
| 98 |
-
DEPENDS ${ICON_PATH}/bitcoin256.png ${ICON_PATH}/bitcoin64.png ${ICON_PATH}/bitcoin48.png ${ICON_PATH}/bitcoin32.png ${ICON_PATH}/bitcoin24.png ${ICON_PATH}/bitcoin20.png ${ICON_PATH}/bitcoin16.png
|
| 99 |
-
COMMENT "Generating ${bitcoin_ico} from Roots icon sizes"
|
| 100 |
-
VERBATIM
|
| 101 |
-
)
|
| 102 |
-
add_custom_command(
|
| 103 |
-
OUTPUT "${testnet_ico}"
|
| 104 |
-
COMMAND "${IMAGEMAGICK_CONVERT}" "${bitcoin_ico}" -modulate 100,100,138.9 -colorspace HSL -channel G -evaluate subtract "11.76%" +channel -colorspace sRGB "${testnet_ico}"
|
| 105 |
-
DEPENDS "${bitcoin_ico}"
|
| 106 |
-
COMMENT "Generating ${testnet_ico} from ${bitcoin_ico}"
|
| 107 |
-
VERBATIM
|
| 108 |
-
)
|
| 109 |
-
add_custom_target(generate_ico DEPENDS "${bitcoin_ico}" "${testnet_ico}")
|
| 110 |
-
|
| 111 |
-
set(roots_logo_png "${ICON_PATH}/bitcoinroots-logo.png")
|
| 112 |
-
add_custom_command(
|
| 113 |
-
OUTPUT "${roots_logo_png}"
|
| 114 |
-
COMMAND "${RSVG_CONVERT}" -f png -d 960 -p 960 --output "${roots_logo_png}" "${CMAKE_CURRENT_SOURCE_DIR}/${bitcoin_svg}"
|
| 115 |
-
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${bitcoin_svg}"
|
| 116 |
-
COMMENT "Generating ${roots_logo_png} from ${bitcoin_svg}"
|
| 117 |
-
VERBATIM
|
| 118 |
-
)
|
| 119 |
-
add_custom_target(generate_roots_splash DEPENDS "${roots_logo_png}")
|
| 120 |
|
| 121 |
configure_file(bitcoin_locale.qrc bitcoin_locale.qrc USE_SOURCE_PERMISSIONS COPYONLY)
|
| 122 |
-
configure_file(bitcoin_rendered.qrc bitcoin_rendered.qrc USE_SOURCE_PERMISSIONS COPYONLY)
|
| 123 |
|
| 124 |
# The bitcoinqt sources have to include headers in
|
| 125 |
# order to parse them to collect translatable strings.
|
|
@@ -186,7 +127,6 @@ add_library(bitcoinqt STATIC EXCLUDE_FROM_ALL
|
|
| 186 |
$<$<PLATFORM_ID:Windows>:winshutdownmonitor.h>
|
| 187 |
bitcoin.qrc
|
| 188 |
${CMAKE_CURRENT_BINARY_DIR}/bitcoin_locale.qrc
|
| 189 |
-
${CMAKE_CURRENT_BINARY_DIR}/bitcoin_rendered.qrc
|
| 190 |
)
|
| 191 |
target_compile_definitions(bitcoinqt
|
| 192 |
PUBLIC
|
|
@@ -213,8 +153,6 @@ target_link_libraries(bitcoinqt
|
|
| 213 |
$<$<PLATFORM_ID:Darwin>:-framework\ AppKit>
|
| 214 |
$<$<CXX_COMPILER_ID:MSVC>:shlwapi>
|
| 215 |
)
|
| 216 |
-
add_dependencies(bitcoinqt generate_roots_splash)
|
| 217 |
-
|
| 218 |
if(ENABLE_WALLET)
|
| 219 |
target_sources(bitcoinqt
|
| 220 |
PRIVATE
|
|
@@ -331,10 +269,6 @@ add_executable(bitcoin-qt
|
|
| 331 |
../init/bitcoin-qt.cpp
|
| 332 |
)
|
| 333 |
|
| 334 |
-
if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
| 335 |
-
add_dependencies(bitcoin-qt generate_ico)
|
| 336 |
-
endif()
|
| 337 |
-
|
| 338 |
if(WIN32)
|
| 339 |
configure_file(res/bitcoin-qt-res.rc res/bitcoin-qt-res.rc USE_SOURCE_PERMISSIONS @ONLY)
|
| 340 |
add_windows_resources(bitcoin-qt ${CMAKE_CURRENT_BINARY_DIR}/res/bitcoin-qt-res.rc)
|
|
|
|
| 59 |
set(CMAKE_AUTOUIC ON)
|
| 60 |
set(CMAKE_AUTOUIC_SEARCH_PATHS forms)
|
| 61 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 62 |
|
| 63 |
configure_file(bitcoin_locale.qrc bitcoin_locale.qrc USE_SOURCE_PERMISSIONS COPYONLY)
|
|
|
|
| 64 |
|
| 65 |
# The bitcoinqt sources have to include headers in
|
| 66 |
# order to parse them to collect translatable strings.
|
|
|
|
| 127 |
$<$<PLATFORM_ID:Windows>:winshutdownmonitor.h>
|
| 128 |
bitcoin.qrc
|
| 129 |
${CMAKE_CURRENT_BINARY_DIR}/bitcoin_locale.qrc
|
|
|
|
| 130 |
)
|
| 131 |
target_compile_definitions(bitcoinqt
|
| 132 |
PUBLIC
|
|
|
|
| 153 |
$<$<PLATFORM_ID:Darwin>:-framework\ AppKit>
|
| 154 |
$<$<CXX_COMPILER_ID:MSVC>:shlwapi>
|
| 155 |
)
|
|
|
|
|
|
|
| 156 |
if(ENABLE_WALLET)
|
| 157 |
target_sources(bitcoinqt
|
| 158 |
PRIVATE
|
|
|
|
| 269 |
../init/bitcoin-qt.cpp
|
| 270 |
)
|
| 271 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 272 |
if(WIN32)
|
| 273 |
configure_file(res/bitcoin-qt-res.rc res/bitcoin-qt-res.rc USE_SOURCE_PERMISSIONS @ONLY)
|
| 274 |
add_windows_resources(bitcoin-qt ${CMAKE_CURRENT_BINARY_DIR}/res/bitcoin-qt-res.rc)
|