mirror of
https://github.com/JulianGro/overte.git
synced 2025-04-08 01:22:25 +02:00
don't call copy dll step for scribe
This commit is contained in:
parent
66ab2ba9f9
commit
33b0fd24a6
2 changed files with 9 additions and 20 deletions
|
@ -11,12 +11,6 @@
|
|||
|
||||
macro(COPY_DLLS_BESIDE_WINDOWS_EXECUTABLE)
|
||||
|
||||
if (NOT ${ARGN})
|
||||
set(USES_QT TRUE)
|
||||
else ()
|
||||
set(USES_QT ${ARGN})
|
||||
endif ()
|
||||
|
||||
if (WIN32)
|
||||
configure_file(
|
||||
${HIFI_CMAKE_DIR}/templates/FixupBundlePostBuild.cmake.in
|
||||
|
@ -33,16 +27,13 @@ macro(COPY_DLLS_BESIDE_WINDOWS_EXECUTABLE)
|
|||
-P ${CMAKE_CURRENT_BINARY_DIR}/FixupBundlePostBuild.cmake
|
||||
)
|
||||
|
||||
if (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 ()
|
||||
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 ()
|
||||
endmacro()
|
|
@ -1,4 +1,2 @@
|
|||
set(TARGET_NAME scribe)
|
||||
setup_hifi_project()
|
||||
|
||||
copy_dlls_beside_windows_executable(false)
|
||||
setup_hifi_project()
|
Loading…
Reference in a new issue