From bd40ea057b4ebd3541981fea8217f14e1d273a26 Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Wed, 24 Apr 2019 14:42:18 -0700 Subject: [PATCH] Testing `windeployqt` --- cmake/macros/PackageLibrariesForDeployment.cmake | 7 +++++++ hifi_vcpkg.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cmake/macros/PackageLibrariesForDeployment.cmake b/cmake/macros/PackageLibrariesForDeployment.cmake index 29f4617a6f..fa7f52993b 100644 --- a/cmake/macros/PackageLibrariesForDeployment.cmake +++ b/cmake/macros/PackageLibrariesForDeployment.cmake @@ -36,6 +36,13 @@ macro(PACKAGE_LIBRARIES_FOR_DEPLOYMENT) endif () # add a post-build command to call windeployqt to copy Qt plugins +message("+++++++++++++++++++++++++++++++++++++") +message(STATUS ${TARGET_NAME}) +message(STATUS ${QT_DIR}) +message(STATUS ${TARGET_FILE}) +message(STATUS ${WINDEPLOYQT_COMMAND}) +message(STATUS ${EXTRA_DEPLOY_OPTIONS}) +message("-------------------------------------") add_custom_command( TARGET ${TARGET_NAME} POST_BUILD diff --git a/hifi_vcpkg.py b/hifi_vcpkg.py index 7bc35b28c3..e1d509b9df 100644 --- a/hifi_vcpkg.py +++ b/hifi_vcpkg.py @@ -240,7 +240,7 @@ endif() def installQt(self): - if True or not os.path.isdir(os.path.join(self.path, 'installed', 'qt5-install')): + if not os.path.isdir(os.path.join(self.path, 'installed', 'qt5-install')): print ("Downloading Qt from AWS ") dest = os.path.join(self.path, 'installed') if platform.system() == 'Windows':