mirror of
https://github.com/Armored-Dragon/overte.git
synced 2025-03-11 16:13:16 +01:00
fix for windeployqt for executables
This commit is contained in:
parent
d52ba5e958
commit
fd8240669b
2 changed files with 20 additions and 9 deletions
|
@ -10,6 +10,13 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
macro(COPY_DLLS_BESIDE_WINDOWS_EXECUTABLE)
|
macro(COPY_DLLS_BESIDE_WINDOWS_EXECUTABLE)
|
||||||
|
|
||||||
|
if (NOT ${ARGN})
|
||||||
|
set(USES_QT TRUE)
|
||||||
|
else ()
|
||||||
|
set(USES_QT ${ARGN})
|
||||||
|
endif ()
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
|
|
||||||
configure_file(
|
configure_file(
|
||||||
|
@ -27,14 +34,18 @@ macro(COPY_DLLS_BESIDE_WINDOWS_EXECUTABLE)
|
||||||
-P ${CMAKE_CURRENT_BINARY_DIR}/FixupBundlePostBuild.cmake
|
-P ${CMAKE_CURRENT_BINARY_DIR}/FixupBundlePostBuild.cmake
|
||||||
)
|
)
|
||||||
|
|
||||||
find_program(${WINDEPLOYQT_COMMAND} windeployqt PATHS ${QT_DIR}/bin NO_DEFAULT_PATH)
|
if (NOT USES_QT)
|
||||||
|
|
||||||
|
find_program(WINDEPLOYQT_COMMAND windeployqt PATHS ${QT_DIR}/bin NO_DEFAULT_PATH)
|
||||||
|
|
||||||
|
# add a post-build command to call windeployqt to copy Qt plugins
|
||||||
|
add_custom_command(
|
||||||
|
TARGET ${TARGET_NAME}
|
||||||
|
POST_BUILD
|
||||||
|
COMMAND CMD /C "SET PATH=%PATH%;${QT_DIR}/bin && ${WINDEPLOYQT_COMMAND} --no-libraries $<TARGET_FILE:${TARGET_NAME}>"
|
||||||
|
)
|
||||||
|
|
||||||
|
endif ()
|
||||||
|
|
||||||
# add a post-build command to call windeployqt to copy Qt plugins
|
|
||||||
add_custom_command(
|
|
||||||
TARGET ${TARGET_NAME}
|
|
||||||
POST_BUILD
|
|
||||||
COMMAND SET PATH=%PATH%;${QT_DIR}/bin
|
|
||||||
COMMAND ${WINDEPLOYQT_COMMAND} --no-libraries --force $<TARGET_FILE:${TARGET_NAME}>
|
|
||||||
)
|
|
||||||
endif ()
|
endif ()
|
||||||
endmacro()
|
endmacro()
|
|
@ -1,4 +1,4 @@
|
||||||
set(TARGET_NAME scribe)
|
set(TARGET_NAME scribe)
|
||||||
setup_hifi_project()
|
setup_hifi_project()
|
||||||
|
|
||||||
copy_dlls_beside_windows_executable()
|
copy_dlls_beside_windows_executable(false)
|
Loading…
Reference in a new issue