diff --git a/cmake/macros/CopyDllsBesideWindowsExecutable.cmake b/cmake/macros/CopyDllsBesideWindowsExecutable.cmake index 43373d9da0..a97603a6ca 100644 --- a/cmake/macros/CopyDllsBesideWindowsExecutable.cmake +++ b/cmake/macros/CopyDllsBesideWindowsExecutable.cmake @@ -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 $" - ) - - 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 $" + ) endif () endmacro() \ No newline at end of file diff --git a/tools/scribe/CMakeLists.txt b/tools/scribe/CMakeLists.txt index 4196909043..b71a287e46 100755 --- a/tools/scribe/CMakeLists.txt +++ b/tools/scribe/CMakeLists.txt @@ -1,4 +1,2 @@ set(TARGET_NAME scribe) -setup_hifi_project() - -copy_dlls_beside_windows_executable(false) \ No newline at end of file +setup_hifi_project() \ No newline at end of file