tsiry-sandratraina.com
A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita
audio
rust
zig
deno
mpris
rockbox
mpd
utils: Work around windeployqt bug.
For Qt versions less than 5.14 MinGW windeployqt requires passing
--release or --debug to pick the correct libs to deploy. For newer
version this must not be passed, or otherwise windeployqt errors out.
Use a conditional expression to only add the parameter for older Qt
versions.
Change-Id: I7afe2b77e9829e989adaeeb7c7499d5955926da2
+6
-3
+6
-3
utils/cmake/deploy.cmake
+6
-3
utils/cmake/deploy.cmake
···
104
104
endif()
105
105
set(DMGBUILD ${CMAKE_BINARY_DIR}/venv/bin/python3 -m dmgbuild)
106
106
set(DMGBUILD_STAMP ${CMAKE_BINARY_DIR}/dmgbuild.stamp)
107
-
find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${qtbindir}")
107
+
find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${QTBINDIR}")
108
108
109
109
# need extra rules so we can use generator expressions
110
110
# (using get_target_property() doesn't know neede values during generation)
···
160
160
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
161
161
message(WARNING "Deploying a Debug build.")
162
162
endif()
163
-
find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${qtbindir}")
163
+
find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${QTBINDIR}")
164
164
set(deploydir ${CMAKE_BINARY_DIR}/deploy-${deploy_TARGET})
165
165
if(WINDEPLOYQT_EXECUTABLE)
166
166
add_custom_command(
···
169
169
COMMAND ${CMAKE_COMMAND} -E make_directory ${deploydir}
170
170
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${deploy_TARGET}> ${deploydir}
171
171
COMMAND ${WINDEPLOYQT_EXECUTABLE}
172
-
$<IF:$<CONFIG:Debug>,--debug,--release> # on MinGW, release is mistaken as debug.
172
+
# on MinGW, release is mistaken as debug for Qt less than 5.14.
173
+
# For later versions the opposite is true: adding --debug or
174
+
# --release will fail with "platform plugin not found."
175
+
$<IF:$<VERSION_LESS:${Qt${QT_VERSION_MAJOR}Core_VERSION},5.14.0>,$<IF:$<CONFIG:Debug>,--debug,--release>,>
173
176
${deploydir}/$<TARGET_FILE_NAME:${deploy_TARGET}>
174
177
DEPENDS ${deploy_TARGET}
175
178
)