From f68fb05080e75b50b0d3288b297a6f74feeb7175 Mon Sep 17 00:00:00 2001 From: Aleksey Komarov Date: Thu, 24 May 2018 07:48:19 +0300 Subject: [PATCH] test fix appveyor. Part 17 --- CMakeLists.txt | 4 ++++ appveyor.yml | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab576e0004a..03343934d26 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,10 @@ project(OpenXRay) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) +IF(MINGW) +SET(CMAKE_BUILD_TOOL mingw32-make) +ENDIF(MINGW) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive --std=c++17") add_definitions(-D_MT -D_CPPUNWIND -DPURE_DYNAMIC_CAST -DDECLARE_SPECIALIZATION -DM_NOSTDCONTAINERS_EXT -DUSE_OGL) diff --git a/appveyor.yml b/appveyor.yml index e17587614bb..8ea794cf9c3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,12 +28,13 @@ install: invoke '7z' 'x -oC:\ mw64.7z'; } build_script: -- git submodule update --init --recursive +- 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 - ECHO %PATH% +- git submodule update --init --recursive - if [%tbs_tools%]==[mingw] ( - SET "PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%" && SET "PATH=%PATH:C:\Program Files\Git\usr\bin=%" && + SET "PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%" && MKDIR bin && CD bin && cmake .. -G "MinGW Makefiles"&&