StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

try to get appveyor to work properly

Browse Source
This commit is contained in:
ThePhD 2019-03-24 19:21:58 -04:00
parent 33c4ea0d2a
commit 5858231158
No known key found for this signature in database
GPG Key ID: 1509DB1C0F702BFA
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@ -130,7 +130,7 @@ init:
- if "%PLATFORM%"=="x64" (set arch= Win64) - 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 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 "%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) - if "%SOL2_BUILD_NINJA%"=="1"(set CMAKE_GENERATOR=Ninja&&set parallelism= )
- set lua_build_type=ON - set lua_build_type=ON
- set build_compiler=-DCMAKE_CXX_COMPILER=cl.exe -DCMAKE_C_COMPILER=cl.exe - 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 - set vcvars_script="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64

8
scripts/run.linux.sh
View File

@ -24,7 +24,7 @@
# # This script runs the actual project # # This script runs the actual project
echo -e "travis_fold:start:build_preparation.1\r" echo -e "travis_fold:start:build_preparation\r"
if [ -z "${SOL2_DIR}" ] if [ -z "${SOL2_DIR}" ]
then then
if [ "${SOL2_CI}" = true ] if [ "${SOL2_CI}" = true ]
@ -101,11 +101,11 @@ echo -e "travis_fold:start:build_preparation.1\r"
fi fi
mkdir -p Debug Release mkdir -p Debug Release
echo -e "travis_fold:end:build_preparation.1\r" echo -e "travis_fold:end:build_preparation\r"
# show the tool and compiler versions we're using # show the tool and compiler versions we're using
echo -e "travis_fold:start:build_preparation.2\r" echo -e "travis_fold:start:build_preparation\r"
echo "=== Compiler and tool variables ===" echo "=== Compiler and tool variables ==="
ninja --version ninja --version
cmake --version cmake --version
@ -113,7 +113,7 @@ echo -e "travis_fold:start:build_preparation.2\r"
echo build_type_cc : "${build_type_cc}" echo build_type_cc : "${build_type_cc}"
echo build_type_cxx : "${build_type_cxx}" echo build_type_cxx : "${build_type_cxx}"
echo cmake defines : "${SOL2_CMAKE_DEFINES[@]}" echo cmake defines : "${SOL2_CMAKE_DEFINES[@]}"
echo -e "travis_fold:end:build_preparation.2\r" echo -e "travis_fold:end:build_preparation\r"
echo -e "travis_fold:start:build.debug\r" echo -e "travis_fold:start:build.debug\r"
cd Debug cd Debug