From 66ab2ba9f908c489f7448b5959056702bf55adc2 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 25 Feb 2015 10:44:02 -0800 Subject: [PATCH] fix for flipped conditional for dll fixup --- cmake/macros/CopyDllsBesideWindowsExecutable.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cmake/macros/CopyDllsBesideWindowsExecutable.cmake b/cmake/macros/CopyDllsBesideWindowsExecutable.cmake index 61d35d93b1..43373d9da0 100644 --- a/cmake/macros/CopyDllsBesideWindowsExecutable.cmake +++ b/cmake/macros/CopyDllsBesideWindowsExecutable.cmake @@ -18,7 +18,6 @@ macro(COPY_DLLS_BESIDE_WINDOWS_EXECUTABLE) endif () if (WIN32) - configure_file( ${HIFI_CMAKE_DIR}/templates/FixupBundlePostBuild.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FixupBundlePostBuild.cmake @@ -34,8 +33,7 @@ macro(COPY_DLLS_BESIDE_WINDOWS_EXECUTABLE) -P ${CMAKE_CURRENT_BINARY_DIR}/FixupBundlePostBuild.cmake ) - if (NOT USES_QT) - + 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 @@ -46,6 +44,5 @@ macro(COPY_DLLS_BESIDE_WINDOWS_EXECUTABLE) ) endif () - endif () endmacro() \ No newline at end of file