test fix appveyor. Part 22

OpenXRay · May 24, 2018 · 2172783 · 2172783
1 parent c65a7cf
commit 2172783
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,6 @@ project(OpenXRay)
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
 IF(MINGW)
-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
@@ -33,16 +33,15 @@ build_script:
 # and the MinGW build will not work (the Visual Studio build does not care).
 
 - 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%" &&
+    SET "PATH=%PATH:C:\Program Files\Git\usr\bin=%"
   )
-
-  - ECHO %PATH%
-  if [%tbs_tools%]==[mingw] (
-    - MKDIR bin
-    - CD bin
-    - cmake .. -G "MinGW Makefiles"
-    - mingw32-make
+- ECHO %PATH%
+- if [%tbs_tools%]==[mingw] (
+    MKDIR bin &&
+    CD bin &&
+    cmake .. -G "MinGW Makefiles" &&
+    mingw32-make
   )
 - if [%tbs_tools%]==[msvcDISABLE] (
     ECHO '%cd%' &&