From e411505b8d391fb79aed0e21c8e86bc679b9b90f Mon Sep 17 00:00:00 2001 From: ThePhD Date: Sun, 24 Mar 2019 19:34:54 -0400 Subject: [PATCH] trying it again --- appveyor.yml | 9 ++++----- scripts/run.linux.sh | 4 ---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 97ec54e0..165f68ad 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -128,10 +128,9 @@ init: - set arch= x86 - set parallelism= - if "%PLATFORM%"=="x64" (set arch= Win64) -- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (set CMAKE_GENERATOR=Visual Studio 15 2017%arch%&&set parallelism=/maxcpucount) -- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (set CMAKE_GENERATOR=Visual Studio 14 2015%arch%&&set parallelism=/maxcpucount) -- if "%SOL2_BUILD_NINJA%"=="1"(set CMAKE_GENERATOR=Ninja&&set parallelism= ) -- set lua_build_type=ON +- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (set CMAKE_GENERATOR=Visual Studio 15 2017%arch%) +- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (set CMAKE_GENERATOR=Visual Studio 14 2015%arch%) +- if "%SOL2_BUILD_NINJA%"=="1" (set CMAKE_GENERATOR=Ninja) else (set parallelism=/maxcpucount) - set build_compiler=-DCMAKE_CXX_COMPILER=cl.exe -DCMAKE_C_COMPILER=cl.exe - set vcvars_script="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - if "%PLATFORM%"=="x86" (vcvars_script="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86) @@ -149,7 +148,7 @@ before_build: - md build-sol2 - cd build-sol2 - if "%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=%lua_build_type% -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: - cmake --build . --config Release -- %parallelism% diff --git a/scripts/run.linux.sh b/scripts/run.linux.sh index 1275d1e3..2ef7a743 100644 --- a/scripts/run.linux.sh +++ b/scripts/run.linux.sh @@ -101,11 +101,7 @@ echo -e "travis_fold:start:build_preparation\r" fi mkdir -p Debug Release -echo -e "travis_fold:end:build_preparation\r" - -# show the tool and compiler versions we're using -echo -e "travis_fold:start:build_preparation\r" echo "=== Compiler and tool variables ===" ninja --version cmake --version