set vcvars and actually call it with proper not-defined check

This commit is contained in:
ThePhD 2019-03-25 02:14:52 -04:00
parent 5567163743
commit 3e2c48a104
No known key found for this signature in database
GPG Key ID: 1509DB1C0F702BFA

View File

@ -45,23 +45,23 @@ platform:
environment: environment:
matrix: matrix:
- SOL2_LUA_VERSION: luajit-2.0.5 - SOL2_LUA_VERSION: luajit-2.0.5
SOL2_NO_2015: 1
SOL2_BUILD_NINJA: 1 SOL2_BUILD_NINJA: 1
SOL2_NO_2015: 1
- SOL2_LUA_VERSION: luajit-2.1.0-beta3 - SOL2_LUA_VERSION: luajit-2.1.0-beta3
SOL2_NO_2015: 1
SOL2_BUILD_NINJA: 1 SOL2_BUILD_NINJA: 1
SOL2_NO_2015: 1
- SOL2_LUA_VERSION: 5.3.5 - SOL2_LUA_VERSION: 5.3.5
SOL2_BUILD_NINJA: 1
MINGW_VERSION: 7.3.0 MINGW_VERSION: 7.3.0
SOL2_BUILD_NINJA: 1
- SOL2_LUA_VERSION: 5.3.5 - SOL2_LUA_VERSION: 5.3.5
MINGW_VERSION: 8.1.0
SOL2_BUILD_NINJA: 1 SOL2_BUILD_NINJA: 1
MINGW_VERSION: 8.1.0
- SOL2_LUA_VERSION: luajit-2.0.5 - SOL2_LUA_VERSION: luajit-2.0.5
MINGW_VERSION: 8.1.0
SOL2_BUILD_NINJA: 1 SOL2_BUILD_NINJA: 1
MINGW_VERSION: 8.1.0
- SOL2_LUA_VERSION: luajit-2.1.0-beta3 - SOL2_LUA_VERSION: luajit-2.1.0-beta3
MINGW_VERSION: 8.1.0
SOL2_BUILD_NINJA: 1 SOL2_BUILD_NINJA: 1
MINGW_VERSION: 8.1.0
- SOL2_LUA_VERSION: 5.3.5 - SOL2_LUA_VERSION: 5.3.5
SOL2_NO_2015: 1 SOL2_NO_2015: 1
- SOL2_LUA_VERSION: 5.2.4 - SOL2_LUA_VERSION: 5.2.4
@ -154,7 +154,7 @@ init:
before_build: before_build:
- md build-sol2 - md build-sol2
- cd build-sol2 - cd build-sol2
- if "%MINGW_VERSION%"=="" ( %vcvars_script% ) - if not defined MINGW_VERSION ( %vcvars_script% )
- cmake .. -G "%CMAKE_GENERATOR%" %build_compiler% -DCMAKE_BUILD_TYPE=Release "-DSOL2_LUA_VERSION=%SOL2_LUA_VERSION%" -DSOL2_PLATFORM=%PLATFORM% -DSOL2_CI=ON -DSOL2_BUILD_LUA=ON -DBUILD_LUA_AS_DLL=ON -DSOL2_TESTS=ON -DSOL2_EXAMPLES=ON -DSOL2_TESTS_EXAMPLES=ON - cmake .. -G "%CMAKE_GENERATOR%" %build_compiler% -DCMAKE_BUILD_TYPE=Release "-DSOL2_LUA_VERSION=%SOL2_LUA_VERSION%" -DSOL2_PLATFORM=%PLATFORM% -DSOL2_CI=ON -DSOL2_BUILD_LUA=ON -DBUILD_LUA_AS_DLL=ON -DSOL2_TESTS=ON -DSOL2_EXAMPLES=ON -DSOL2_TESTS_EXAMPLES=ON
build_script: build_script: