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 cmake build and try out new appveyor commands

Browse Source
This commit is contained in:
ThePhD 2017-12-24 01:44:51 -05:00
parent 453a0daaaf
commit 7fae78b23b
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -26,7 +26,7 @@ project(sol2 VERSION 2.19.0 LANGUAGES CXX C)
if (MSVC)
add_definitions(/DUNICODE /D_UNICODE /D_SILENCE_CXX17_UNCAUGHT_EXCEPTION_DEPRECATION_WARNING /D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING)
add_compile_options(/W4 /EHsc /std:c++latest)
add_compile_options(/W4 /EHsc)
else()
add_compile_options(-Wno-unknown-warning -Wno-unknown-warning-option -Wall -Wextra -Wpedantic -pedantic -pedantic-errors -Wno-noexcept-type -ftemplate-depth=1024)
endif()

2
appveyor.yml
View File

@ -57,7 +57,7 @@ before_build:
- set PATH=%PYTHON_PATH%;%PATH%
- md build-sol2
- cd build-sol2
- cmake .. -G "%CMAKE_GENERATOR%" -DLUA_VERSION="%LUA_VERSION%" -DBUILD_LUA=ON -DTESTS=ON -DEXAMPLES=ON -DSINGLE=ON -DTESTS_EXAMPLES=ON -DTESTS_SINGLE=ON
- cmake .. -G "%CMAKE_GENERATOR%" -DLUA_VERSION="%LUA_VERSION%" -DBUILD_LUA=ON -DBUILD_LUA_AS_DLL=OFF -DTESTS=ON -DEXAMPLES=ON -DSINGLE=ON -DTESTS_EXAMPLES=ON -DTESTS_SINGLE=ON
build_script:
- cmake --build .

6
cmake/Modules/LuaVanillaBuild.cmake
View File

@ -206,6 +206,10 @@ else()
set(LUA_VANILLA_LUAC_SOURCES luac.c )
endif()
if (BUILD_LUA_AS_DLL)
set(LUA_VANILLA_LUAC_SOURCES ${LUA_VANILLA_LUAC_SOURCES} ${LUA_VANILLA_LIB_SOURCES})
endif()
set(LUA_VANILLA_SOURCE_DIR "${LUA_BUILD_TOPLEVEL}/src")
prepend(LUA_VANILLA_LIB_SOURCES "${LUA_VANILLA_SOURCE_DIR}/" ${LUA_VANILLA_LIB_SOURCES})
prepend(LUA_VANILLA_LUA_SOURCES "${LUA_VANILLA_SOURCE_DIR}/" ${LUA_VANILLA_LUA_SOURCES})
@ -420,7 +424,7 @@ if (LUA_VANILLA_BUILD_DIRECTLY)
target_compile_definitions(${luacompiler}
PRIVATE LUA_USE_LINUX)
endif()
#target_link_libraries(${luacompiler} ${lualib})
target_link_libraries(${luacompiler} ${lualib})
if (CMAKE_DL_LIBS)
target_link_libraries(${luacompiler} ${CMAKE_DL_LIBS})
endif()