test fix appveyor. Part 17

OpenXRay · May 24, 2018 · f68fb05 · f68fb05
1 parent 6e1ffa9
commit f68fb05
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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"&&