From c65a7cfe8d2359cbe66898be3f7c64a74b0d3243 Mon Sep 17 00:00:00 2001 From: Aleksey Komarov Date: Thu, 24 May 2018 08:07:27 +0300 Subject: [PATCH] test fix appveyor. Part 21 --- CMakeLists.txt | 2 +- appveyor.yml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 03343934d26..d535b7cdecf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(OpenXRay) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) IF(MINGW) -SET(CMAKE_BUILD_TOOL mingw32-make) +SET(CMAKE_MAKE_PROGRAM mingw32-make) ENDIF(MINGW) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive --std=c++17") diff --git a/appveyor.yml b/appveyor.yml index bec46dbfee3..b2bc1a967ef 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,12 +21,6 @@ environment: - tbs_arch: x64 tbs_tools: msvc tbs_config: Release -install: -- ps: >- - if($env:tbs_tools -eq 'mingw' -and $env:tbs_arch -eq 'x64xDISABLE') { - invoke 'curl' '-L -o mw64.7z "http://libgd.blob.core.windows.net/mingw/x86_64-4.9.1-release-posix-seh-rt_v3-rev1.7z"'; - invoke '7z' 'x -oC:\ mw64.7z'; - } build_script: - C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin\mingw32-make --version - C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin\g++ --version