diff options
-rw-r--r-- | utils/cmake/deploy.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/utils/cmake/deploy.cmake b/utils/cmake/deploy.cmake index f1430f0dee..252aba0636 100644 --- a/utils/cmake/deploy.cmake +++ b/utils/cmake/deploy.cmake | |||
@@ -104,7 +104,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") | |||
104 | endif() | 104 | endif() |
105 | set(DMGBUILD ${CMAKE_BINARY_DIR}/venv/bin/python3 -m dmgbuild) | 105 | set(DMGBUILD ${CMAKE_BINARY_DIR}/venv/bin/python3 -m dmgbuild) |
106 | set(DMGBUILD_STAMP ${CMAKE_BINARY_DIR}/dmgbuild.stamp) | 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 | # need extra rules so we can use generator expressions | 109 | # need extra rules so we can use generator expressions |
110 | # (using get_target_property() doesn't know neede values during generation) | 110 | # (using get_target_property() doesn't know neede values during generation) |
@@ -160,7 +160,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") | |||
160 | if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") | 160 | if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") |
161 | message(WARNING "Deploying a Debug build.") | 161 | message(WARNING "Deploying a Debug build.") |
162 | endif() | 162 | endif() |
163 | find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${qtbindir}") | 163 | find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${QTBINDIR}") |
164 | set(deploydir ${CMAKE_BINARY_DIR}/deploy-${deploy_TARGET}) | 164 | set(deploydir ${CMAKE_BINARY_DIR}/deploy-${deploy_TARGET}) |
165 | if(WINDEPLOYQT_EXECUTABLE) | 165 | if(WINDEPLOYQT_EXECUTABLE) |
166 | add_custom_command( | 166 | add_custom_command( |
@@ -169,7 +169,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") | |||
169 | COMMAND ${CMAKE_COMMAND} -E make_directory ${deploydir} | 169 | COMMAND ${CMAKE_COMMAND} -E make_directory ${deploydir} |
170 | COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${deploy_TARGET}> ${deploydir} | 170 | COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${deploy_TARGET}> ${deploydir} |
171 | COMMAND ${WINDEPLOYQT_EXECUTABLE} | 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 | ${deploydir}/$<TARGET_FILE_NAME:${deploy_TARGET}> | 176 | ${deploydir}/$<TARGET_FILE_NAME:${deploy_TARGET}> |
174 | DEPENDS ${deploy_TARGET} | 177 | DEPENDS ${deploy_TARGET} |
175 | ) | 178 | ) |