From 2f1d305008ebcdaadc4e84250e8711ec579cca20 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Thu, 13 Feb 2014 09:52:53 -0800 Subject: [PATCH] Hack to fix Windows Release build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Either this location is incorrect, or it is an optional install that I haven’t figured out how to get yet. Either way, this is failing TeamCity Windows Releases builds which I want to turn on. So for now, I’m disabling. I’ll figure out how to make it work correctly with my work on generating windows installs. --- QGCSetup.pri | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/QGCSetup.pri b/QGCSetup.pri index 95f4c0120..894bf1dbf 100644 --- a/QGCSetup.pri +++ b/QGCSetup.pri @@ -186,10 +186,13 @@ WindowsBuild { ReleaseBuild { QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(del /F "$$DESTDIR_WIN\\$${TARGET}.exp") + # This next xcopy does not always work because the files are not there by default, so disabling for now while + # we figure out the right way to do it + # Copy Visual Studio DLLs # Note that this is only done for release because the debugging versions of these DLLs cannot be redistributed. # I'm not certain of the path for VS2008, so this only works for VS2010. - win32-msvc2010 { + win32-msvc2010_NotWorkingButKeepingIn { QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(xcopy /D /Y "\"C:\\Program Files \(x86\)\\Microsoft Visual Studio 10.0\\VC\\redist\\x86\\Microsoft.VC100.CRT\\*.dll\"" "$$DESTDIR_WIN\\") } } -- 2.22.0