Merge branch 'appveyor-fix'

This commit is contained in:
Dmitry Marakasov 2017-02-08 13:11:19 +03:00
commit d8d91927bc

View File

@ -7,7 +7,7 @@ environment:
PREFIX: c:\usr_msvc
MSVC:
MINGW32: rem
- CMAKE_ARGS: -DCMAKE_C_COMPILER=mingw32-cc -DCMAKE_CXX_COMPILER=mingw32-c++ -DCMAKE_MAKE_PROGRAM=mingw32-make.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DSDL2PP_ENABLE_LIVE_TESTS=OFF -DSDL2PP_WITH_WERROR=YES -G "MinGW Makefiles"
- CMAKE_ARGS: -DCMAKE_C_COMPILER=mingw32-gcc -DCMAKE_CXX_COMPILER=mingw32-g++ -DCMAKE_MAKE_PROGRAM=mingw32-make.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DSDL2PP_ENABLE_LIVE_TESTS=OFF -DSDL2PP_WITH_WERROR=YES -G "MinGW Makefiles"
PREFIX: c:\usr_mingw32
MINGW32:
MSVC: rem
@ -87,7 +87,7 @@ before_build:
build_script:
# build
- |-
%MINGW% set PATH=c:\mingw\bin;%PATH%
%MINGW32% set PATH=c:\mingw\bin;%PATH%
cd %APPVEYOR_BUILD_FOLDER%
cmake -DCMAKE_PREFIX_PATH=%PREFIX% %CMAKE_ARGS% .
@ -100,7 +100,7 @@ build_script:
- |-
set PATH=%PREFIX%\lib;%PATH%
%MSVC% set PATH=%APPVEYOR_BUILD_FOLDER%\Debug;%PATH%
%MINGW% set PATH=%APPVEYOR_BUILD_FOLDER%;%PATH%
%MINGW32% set PATH=%APPVEYOR_BUILD_FOLDER%;%PATH%
ctest -V
after_build: