From db77fda6269cbc4393eb1015aa86bce9214cb5b0 Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Thu, 25 Apr 2019 07:46:23 -0700 Subject: [PATCH] testing. --- cmake/macros/PackageLibrariesForDeployment.cmake | 2 +- cmake/templates/FixupBundlePostBuild.cmake.in | 5 ----- tools/qt-builder/README.md | 6 +++--- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/cmake/macros/PackageLibrariesForDeployment.cmake b/cmake/macros/PackageLibrariesForDeployment.cmake index 29f4617a6f..96305839f3 100644 --- a/cmake/macros/PackageLibrariesForDeployment.cmake +++ b/cmake/macros/PackageLibrariesForDeployment.cmake @@ -39,7 +39,7 @@ macro(PACKAGE_LIBRARIES_FOR_DEPLOYMENT) add_custom_command( TARGET ${TARGET_NAME} POST_BUILD - COMMAND CMD /C "SET PATH=%PATH%;${QT_DIR}/bin && ${WINDEPLOYQT_COMMAND}\ + COMMAND CMD /C "SET PATH=%PATH%;BBBBBBBBBBBB/bin && ${WINDEPLOYQT_COMMAND}\ ${EXTRA_DEPLOY_OPTIONS} $<$,$,$>:--release>\ --no-compiler-runtime --no-opengl-sw --no-angle -no-system-d3d-compiler \"$\"" ) diff --git a/cmake/templates/FixupBundlePostBuild.cmake.in b/cmake/templates/FixupBundlePostBuild.cmake.in index 3e816433a0..bb96fe49f3 100644 --- a/cmake/templates/FixupBundlePostBuild.cmake.in +++ b/cmake/templates/FixupBundlePostBuild.cmake.in @@ -73,10 +73,5 @@ else() set(PLUGIN_EXTENSION "so") endif() -message("+++++++++") -message(${BUNDLE_PLUGIN_DIR}) -message(${PLUGIN_EXTENSION}) -message("---------") - file(GLOB EXTRA_PLUGINS "${BUNDLE_PLUGIN_DIR}/*.${PLUGIN_EXTENSION}") fixup_bundle("${BUNDLE_EXECUTABLE}" "${EXTRA_PLUGINS}" "@FIXUP_LIBS@" IGNORE_ITEM "vcredist_x86.exe;vcredist_x64.exe") diff --git a/tools/qt-builder/README.md b/tools/qt-builder/README.md index f3aeb7a497..2cd2b879c7 100644 --- a/tools/qt-builder/README.md +++ b/tools/qt-builder/README.md @@ -125,9 +125,9 @@ Before building, verify that **HIFI_VCPKG_BASE_VERSION** points to a *vcpkg* fol `git apply --ignore-space-change --ignore-whitespace patches/aec.patch` `cd ..` #### Configuring -`mkdir qt5-install` -`mkdir qt5-build` -`cd qt5-build` +`mkdir qt5-install` +`mkdir qt5-build` +`cd qt5-build` run `..\qt5\qt5vars.bat` `cd ..\..\qt5-build`