Use the standalone CMake installation instead of the one shipped with MSVC 2017 when testing MSVC 2017 in AppVeyor. This is to (hopefully) address a build issue in release mode that was fixed in CMake 3.9.1 (https://gitlab.kitware.com/cmake/cmake/merge_requests/1100) but that's apparently not yet included in the CMake shipped with MSVC 2017.
diff --git a/appveyor.yml b/appveyor.yml
index 533c055..2f52ec6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,20 +4,17 @@
PYTHON3_PATH: C:\Python36
matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- CMAKE_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin'
CMAKE_GENERATOR: 'Visual Studio 15 2017 Win64'
VCVARSALL_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build'
ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False -DCMAKE_CXX_FLAGS="/WX /DFRUIT_DEBUG /DFRUIT_EXTRA_DEBUG /D_ITERATOR_DEBUG_LEVEL=2" -T host=x64'
CONFIGURATION: Debug
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- CMAKE_PATH: 'C:\Program Files (x86)\CMake\bin'
CMAKE_GENERATOR: 'Visual Studio 14 2015 Win64'
VCVARSALL_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC'
ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False -DCMAKE_CXX_FLAGS="/WX /DFRUIT_DEBUG /DFRUIT_EXTRA_DEBUG /D_ITERATOR_DEBUG_LEVEL=2" -T host=x64'
CONFIGURATION: Debug
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
MINGW_PATH: 'C:\MinGW\bin'
- CMAKE_PATH: 'C:\Program Files (x86)\CMake\bin'
CMAKE_GENERATOR: 'MinGW Makefiles'
VCVARSALL_DIR: ''
ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False -DCMAKE_CXX_FLAGS="-Werror -DFRUIT_DEBUG -DFRUIT_EXTRA_DEBUG -D_GLIBCXX_DEBUG"'
@@ -25,45 +22,38 @@
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
MINGW_PATH: 'C:\MinGW\bin'
- CMAKE_PATH: 'C:\Program Files (x86)\CMake\bin'
CMAKE_GENERATOR: 'MinGW Makefiles'
VCVARSALL_DIR: ''
ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False -DCMAKE_CXX_FLAGS="-Werror"'
CONFIGURATION: Release
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
MINGW_PATH: 'C:\MinGW\bin'
- CMAKE_PATH: 'C:\Program Files (x86)\CMake\bin'
CMAKE_GENERATOR: 'MinGW Makefiles'
VCVARSALL_DIR: ''
ADDITIONAL_CMAKE_ARGS: '-DBOOST_DIR=C:\Libraries\boost_1_63_0 -DCMAKE_CXX_FLAGS="-Werror"'
CONFIGURATION: Release
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- CMAKE_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin'
CMAKE_GENERATOR: 'Visual Studio 15 2017 Win64'
VCVARSALL_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build'
ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False -DCMAKE_CXX_FLAGS="/WX"'
CONFIGURATION: Release
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- CMAKE_PATH: 'C:\Program Files (x86)\CMake\bin'
CMAKE_GENERATOR: 'Visual Studio 14 2015 Win64'
VCVARSALL_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC'
ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False -DCMAKE_CXX_FLAGS="/WX" -T host=x64'
CONFIGURATION: Release
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
MINGW_PATH: 'C:\MinGW\bin'
- CMAKE_PATH: 'C:\Program Files (x86)\CMake\bin'
CMAKE_GENERATOR: 'MinGW Makefiles'
VCVARSALL_DIR: ''
ADDITIONAL_CMAKE_ARGS: '-DBOOST_DIR=C:\Libraries\boost_1_63_0 -DBUILD_SHARED_LIBS=False -DCMAKE_CXX_FLAGS="-Werror"'
CONFIGURATION: Release
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- CMAKE_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin'
CMAKE_GENERATOR: 'Visual Studio 15 2017 Win64'
VCVARSALL_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build'
ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False -DBUILD_SHARED_LIBS=False -DCMAKE_CXX_FLAGS="/WX"'
CONFIGURATION: Release
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- CMAKE_PATH: 'C:\Program Files (x86)\CMake\bin'
CMAKE_GENERATOR: 'Visual Studio 14 2015 Win64'
VCVARSALL_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC'
ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False -DBUILD_SHARED_LIBS=False -DCMAKE_CXX_FLAGS="/WX" -T host=x64'
diff --git a/extras/scripts/postsubmit.bat b/extras/scripts/postsubmit.bat
index 2da8a52..59fbb4c 100644
--- a/extras/scripts/postsubmit.bat
+++ b/extras/scripts/postsubmit.bat
@@ -5,7 +5,7 @@
SET POWERSHELL_PATH=
FOR /F "delims=" %%F IN ('where powershell.exe') DO (SET POWERSHELL_PATH=!POWERSHELL_PATH!%%~dpF.;)
-set NEW_PATH=C:\Windows\system32;C:\Windows;%PYTHON3_PATH%;%PYTHON3_PATH%\Scripts;%CMAKE_PATH%;
+set NEW_PATH=C:\Windows\system32;C:\Windows;%PYTHON3_PATH%;%PYTHON3_PATH%\Scripts;C:\Program Files (x86)\CMake\bin;
set PATH=%NEW_PATH%
SET CL_PATH=
