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

update cmakelists with additional deprecation blockers, since they're just so goddamn annoying...

Browse Source 
change appveyor to play nicer and check for MiNGW (even if we won't activate it yet)
This commit is contained in:
ThePhD 2017-12-23 22:04:32 -05:00
parent f041e99f32
commit 6e5d55345a
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
appveyor.yml
View File

@ -33,9 +33,9 @@ configuration: Release
environment:
matrix:
- LUA_VERSION: "5.3.4"
- LUA_VERSION: "5.2.4"
- LUA_VERSION: "5.1.5"
- LUA_VERSION: 5.3.4
- LUA_VERSION: 5.2.4
- LUA_VERSION: 5.1.5
platform:
- x86
@ -45,10 +45,11 @@ init:
- set arch=
- if "%PLATFORM%"=="x64" (set arch= Win64)
- echo %APPVEYOR_BUILD_WORKER_IMAGE%
- 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 "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2013" ( set CMAKE_GENERATOR="Visual Studio 12 2013%arch%" )
- echo %CMAKE_GENERATOR%
- 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 "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2013" ( set CMAKE_GENERATOR=Visual Studio 12 2013%arch% )
- if not "%MINGW_VERSION%"==[""] ( set CMAKE_GENERATOR=MinGW Makefiles )
- echo "%CMAKE_GENERATOR%"
before_build:
- set PYTHON_PATH=C:\Python36
@ -56,7 +57,7 @@ before_build:
- set PATH=%PYTHON_PATH%;%PATH%
- md build-sol2
- cd build-sol2
- cmake .. -G %CMAKE_GENERATOR% -DLUA_VERSION=%LUA_VERSION% -DLUA_BUILD=ON -DTESTS=ON -DEXAMPLES=ON -DSINGLE=ON -DTESTS_EXAMPLES=ON -DTESTS_SINGLE=ON
- cmake .. -G "%CMAKE_GENERATOR%"" -DLUA_VERSION="%LUA_VERSION%" -DLUA_BUILD=ON -DTESTS=ON -DEXAMPLES=ON -DSINGLE=ON -DTESTS_EXAMPLES=ON -DTESTS_SINGLE=ON
build_script:
- cmake --build .

2
tests/CMakeLists.txt
View File

@ -26,7 +26,7 @@ file(GLOB SOL2_TEST_SOURCES test*.cpp)
source_group(test_sources FILES ${SOL2_TEST_SOURCES})
if (MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /EHsc /std:c++latest")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /EHsc /std:c++latest /D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING=1 /D_SILENCE_CXX17_UNCAUGHT_EXCEPTION_DEPRECATION_WARNING=1")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -Wno-unknown-warning -Wno-unknown-warning-option -Wall -Wextra -Wpedantic -pedantic -pedantic-errors -Wno-noexcept-type -ftemplate-depth=1024")
endif()