diff --git a/.appveyor.yml b/.appveyor.yml index ac4a23ba1e2c6d048342a103f211c6dbb587683e..7fc02aae21679818c11ad25f6b3be4016a2928cc 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,7 +2,7 @@ version: 6.0.8.{build} clone_depth: 100 image: - - Visual Studio 2015 + - Visual Studio 2017 environment: PYTHON: "C:\\Python27-x64" @@ -52,14 +52,13 @@ clone_script: } before_build: - - call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 - - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 + - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\vsdevcmd" -arch=x64 - cd %APPVEYOR_BUILD_FOLDER% - echo %APPVEYOR_BUILD_FOLDER% build_script: - mkdir build & cd build - - cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=%configuration% -DBUILD_SHARED_LIBS=OFF -DOGS_EIGEN_DYNAMIC_SHAPE_MATRICES=ON -DOGS_USE_PCH=OFF -DOGS_USE_CONAN=ON # -DOGS_BUILD_GUI=ON + - cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=%configuration% -DBUILD_SHARED_LIBS=OFF -DOGS_EIGEN_DYNAMIC_SHAPE_MATRICES=ON -DOGS_USE_PCH=OFF -DOGS_USE_CONAN=ON -DOGS_CONAN_BUILD=never # -DOGS_BUILD_GUI=ON - cmake --build . --config %configuration% - cmake --build . --config %configuration% --target tests - cmake --build . --config %configuration% --target ctest diff --git a/ThirdParty/cmake-modules b/ThirdParty/cmake-modules index 72b1081914e339350bb529701df84180dddda098..28c3f6046151f88b338d46e5d3149e89e1bf1d15 160000 --- a/ThirdParty/cmake-modules +++ b/ThirdParty/cmake-modules @@ -1 +1 @@ -Subproject commit 72b1081914e339350bb529701df84180dddda098 +Subproject commit 28c3f6046151f88b338d46e5d3149e89e1bf1d15