Skip to content
Bitcoin Roots

v29.4-roots.1 · Commit 7: [PATCH 07/13] release: establish Roots maintenance and assurance

src/qt/CMakeLists.txt

Before: src/qt/CMakeLists.txt · After: src/qt/CMakeLists.txt

File metadata
index b2d7727fb635b152ee6c857dce798e1223b6839d..db50889f690928fc76031a86830369c7e1d88dcd 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
@@ -47,67 +47,7 @@ file(GLOB ts_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} locale/*.ts)
47
  set_source_files_properties(${ts_files} PROPERTIES OUTPUT_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/locale)
48
  qt5_add_translation(qm_files ${ts_files})
49
 
50
- set(ICON_PATH "res/rendered_icons")
51
- set(ICO_SPECS
52
- 256 64 48 32 24 20 16
53
- )
54
- set(ICNS_SPECS
55
- 1024
56
- )
57
- set(bitcoin_svg "res/src/bitcoinroots-logo.svg")
58
-
59
- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${ICON_PATH}")
60
- foreach(size IN LISTS ICO_SPECS ICNS_SPECS)
61
- set(png "${ICON_PATH}/bitcoin${size}.png")
62
- add_custom_command(
63
- OUTPUT "${png}"
64
- COMMAND "${RSVG_CONVERT}" -f png -d ${size} -p ${size} --output "${png}" "${CMAKE_CURRENT_SOURCE_DIR}/${bitcoin_svg}"
65
- DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${bitcoin_svg}"
66
- COMMENT "Generating ${png} from ${bitcoin_svg}"
67
- VERBATIM
68
- )
69
- endforeach()
70
-
71
- set(bitcoin_icns "${ICON_PATH}/bitcoin.icns")
72
- add_custom_command(
73
- OUTPUT "${bitcoin_icns}"
74
- COMMAND "${PNG2ICNS}" "${bitcoin_icns}" "${ICON_PATH}/bitcoin1024.png"
75
- DEPENDS "${ICON_PATH}/bitcoin1024.png"
76
- COMMENT "Generating ${bitcoin_icns} from the Roots icon"
77
- VERBATIM
78
- )
79
- add_custom_target(generate_icns DEPENDS "${bitcoin_icns}")
80
-
81
- set(bitcoin_ico "${ICON_PATH}/bitcoin.ico")
82
- set(testnet_ico "${ICON_PATH}/bitcoin_testnet.ico")
83
- add_custom_command(
84
- OUTPUT "${bitcoin_ico}"
85
- 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}"
86
- 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
87
- COMMENT "Generating ${bitcoin_ico} from Roots icon sizes"
88
- VERBATIM
89
- )
90
- add_custom_command(
91
- OUTPUT "${testnet_ico}"
92
- COMMAND "${IMAGEMAGICK_CONVERT}" "${bitcoin_ico}" -modulate 100,100,138.9 -colorspace HSL -channel G -evaluate subtract "11.76%" +channel -colorspace sRGB "${testnet_ico}"
93
- DEPENDS "${bitcoin_ico}"
94
- COMMENT "Generating ${testnet_ico} from ${bitcoin_ico}"
95
- VERBATIM
96
- )
97
- add_custom_target(generate_ico DEPENDS "${bitcoin_ico}" "${testnet_ico}")
98
-
99
- set(roots_logo_png "${ICON_PATH}/bitcoinroots-logo.png")
100
- add_custom_command(
101
- OUTPUT "${roots_logo_png}"
102
- COMMAND "${RSVG_CONVERT}" -f png -d 960 -p 960 --output "${roots_logo_png}" "${CMAKE_CURRENT_SOURCE_DIR}/${bitcoin_svg}"
103
- DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${bitcoin_svg}"
104
- COMMENT "Generating ${roots_logo_png} from ${bitcoin_svg}"
105
- VERBATIM
106
- )
107
- add_custom_target(generate_roots_splash DEPENDS "${roots_logo_png}")
108
-
109
  configure_file(bitcoin_locale.qrc bitcoin_locale.qrc USE_SOURCE_PERMISSIONS COPYONLY)
110
- configure_file(bitcoin_rendered.qrc bitcoin_rendered.qrc USE_SOURCE_PERMISSIONS COPYONLY)
111
 
112
  # The bitcoinqt sources have to include headers in
113
  # order to parse them to collect translatable strings.
@@ -172,7 +112,6 @@ add_library(bitcoinqt STATIC EXCLUDE_FROM_ALL
172
  $<$<PLATFORM_ID:Windows>:winshutdownmonitor.h>
173
  bitcoin.qrc
174
  ${CMAKE_CURRENT_BINARY_DIR}/bitcoin_locale.qrc
175
- ${CMAKE_CURRENT_BINARY_DIR}/bitcoin_rendered.qrc
176
  )
177
  target_compile_definitions(bitcoinqt
178
  PUBLIC
@@ -199,8 +138,6 @@ target_link_libraries(bitcoinqt
199
  $<$<PLATFORM_ID:Darwin>:-framework\ AppKit>
200
  $<$<CXX_COMPILER_ID:MSVC>:shlwapi>
201
  )
202
- add_dependencies(bitcoinqt generate_roots_splash)
203
-
204
  if(ENABLE_WALLET)
205
  target_sources(bitcoinqt
206
  PRIVATE
@@ -301,10 +238,6 @@ add_executable(bitcoin-qt
301
  ../init/bitcoin-qt.cpp
302
  )
303
 
304
- if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
305
- add_dependencies(bitcoin-qt generate_ico)
306
- endif()
307
-
308
  if(WIN32)
309
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/res/bitcoin-qt-res.rc ${CMAKE_CURRENT_BINARY_DIR}/res/bitcoin-qt-res.rc USE_SOURCE_PERMISSIONS @ONLY)
310
  add_windows_resources(bitcoin-qt ${CMAKE_CURRENT_BINARY_DIR}/res/bitcoin-qt-res.rc)
 
47
  set_source_files_properties(${ts_files} PROPERTIES OUTPUT_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/locale)
48
  qt5_add_translation(qm_files ${ts_files})
49
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
50
  configure_file(bitcoin_locale.qrc bitcoin_locale.qrc USE_SOURCE_PERMISSIONS COPYONLY)
 
51
 
52
  # The bitcoinqt sources have to include headers in
53
  # order to parse them to collect translatable strings.
 
112
  $<$<PLATFORM_ID:Windows>:winshutdownmonitor.h>
113
  bitcoin.qrc
114
  ${CMAKE_CURRENT_BINARY_DIR}/bitcoin_locale.qrc
 
115
  )
116
  target_compile_definitions(bitcoinqt
117
  PUBLIC
 
138
  $<$<PLATFORM_ID:Darwin>:-framework\ AppKit>
139
  $<$<CXX_COMPILER_ID:MSVC>:shlwapi>
140
  )
 
 
141
  if(ENABLE_WALLET)
142
  target_sources(bitcoinqt
143
  PRIVATE
 
238
  ../init/bitcoin-qt.cpp
239
  )
240
 
 
 
 
 
241
  if(WIN32)
242
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/res/bitcoin-qt-res.rc ${CMAKE_CURRENT_BINARY_DIR}/res/bitcoin-qt-res.rc USE_SOURCE_PERMISSIONS @ONLY)
243
  add_windows_resources(bitcoin-qt ${CMAKE_CURRENT_BINARY_DIR}/res/bitcoin-qt-res.rc)