Skip to content

Commit 8ffbd7b

Browse files
committed
Merge bitcoin/bitcoin#32940: cmake: Use newer signature of qt6_add_lrelease when available
9493165 cmake: Use newer signature of `qt6_add_lrelease` when available (Hennadii Stepanov) Pull request description: See Qt docs here: https://doc.qt.io/qt-6/qtlinguist-cmake-qt-add-lrelease.html. Fixes bitcoin/bitcoin#32710. ACKs for top commit: fanquake: ACK 9493165 Tree-SHA512: bf0320306967164374499dd0be122473799e830fdff5e070ef13f87af3c14a3b799d90afb423881edd7eea17c13d27af8ced381bbb3cd149353b31b3990dde67
2 parents 80ce513 + 9493165 commit 8ffbd7b

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/qt/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,11 @@ endif()
245245

246246
file(GLOB ts_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} locale/*.ts)
247247
set_source_files_properties(${ts_files} PROPERTIES OUTPUT_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/locale)
248-
qt6_add_lrelease(bitcoinqt
249-
TS_FILES ${ts_files}
250-
OPTIONS -silent
251-
)
248+
if(Qt6_VERSION VERSION_GREATER_EQUAL 6.7)
249+
qt6_add_lrelease(TS_FILES ${ts_files} OPTIONS -silent)
250+
else()
251+
qt6_add_lrelease(bitcoinqt TS_FILES ${ts_files} OPTIONS -silent)
252+
endif()
252253

253254
add_executable(bitcoin-qt
254255
main.cpp

0 commit comments

Comments
 (0)