Skip to content

Commit 2172783

Browse files
committed
test fix appveyor. Part 22
1 parent c65a7cf commit 2172783

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ project(OpenXRay)
44
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
55

66
IF(MINGW)
7-
SET(CMAKE_MAKE_PROGRAM mingw32-make)
87
ENDIF(MINGW)
98

109
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive --std=c++17")

appveyor.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,15 @@ build_script:
3333
# and the MinGW build will not work (the Visual Studio build does not care).
3434

3535
- if [%tbs_tools%]==[mingw] (
36-
- SET "PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%"
37-
- SET "PATH=%PATH:C:\Program Files\Git\usr\bin=%"
36+
SET "PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%" &&
37+
SET "PATH=%PATH:C:\Program Files\Git\usr\bin=%"
3838
)
39-
40-
- ECHO %PATH%
41-
if [%tbs_tools%]==[mingw] (
42-
- MKDIR bin
43-
- CD bin
44-
- cmake .. -G "MinGW Makefiles"
45-
- mingw32-make
39+
- ECHO %PATH%
40+
- if [%tbs_tools%]==[mingw] (
41+
MKDIR bin &&
42+
CD bin &&
43+
cmake .. -G "MinGW Makefiles" &&
44+
mingw32-make
4645
)
4746
- if [%tbs_tools%]==[msvcDISABLE] (
4847
ECHO '%cd%' &&

0 commit comments

Comments
 (0)