From 279749168ab37c07ad6be358b191f91c82e7e7eb Mon Sep 17 00:00:00 2001 From: vitaut Date: Sat, 27 Jun 2015 08:38:26 -0700 Subject: [PATCH] Try to work around an issue with msbuild caused by Appveyor update --- support/appveyor-build.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/support/appveyor-build.py b/support/appveyor-build.py index 2fbb545c..b995918b 100755 --- a/support/appveyor-build.py +++ b/support/appveyor-build.py @@ -6,15 +6,19 @@ from subprocess import check_call build = os.environ['BUILD'] config = os.environ['CONFIG'] +path = os.environ['PATH'] cmake_command = ['cmake', '-DFMT_PEDANTIC=ON', '-DCMAKE_BUILD_TYPE=' + config] if build == 'mingw': cmake_command.append('-GMinGW Makefiles') build_command = ['mingw32-make', '-j4'] test_command = ['mingw32-make', 'test'] # Remove the path to Git bin directory from $PATH because it breaks MinGW config. - path = os.environ['PATH'].replace(r'C:\Program Files (x86)\Git\bin', '') + path = path.replace(r'C:\Program Files (x86)\Git\bin', '') os.environ['PATH'] = path + r';C:\MinGW\bin' else: + # Add MSBuild 14.0 to PATH as described in + # http://help.appveyor.com/discussions/problems/2229-v140-not-found-on-vs2105rc. + os.environ['PATH'] = r'C:\Program Files (x86)\MSBuild\14.0\Bin;' + path build_command = ['msbuild', '/m:4', '/p:Config=' + config, 'FORMAT.sln'] test_command = ['msbuild', 'RUN_TESTS.vcxproj']