diff --git a/CMakeLists.txt b/CMakeLists.txt index a3f47a2..2b1d0a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 2.8) project(effil) +if(NOT CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 14) +endif() + if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release") endif(NOT CMAKE_BUILD_TYPE) @@ -28,11 +32,15 @@ add_library(effil SHARED ${SOURCES}) target_link_libraries(effil -lpthread ${LUA_LIBRARY} -ldl) set_target_properties(effil PROPERTIES SUFFIX .so) -set(GENERAL "-std=c++14 -DSOL_EXCEPTIONS_SAFE_PROPAGATION") -set(ENABLE_WARNINGS "-Wall -Wextra -pedantic") -set(CMAKE_CXX_FLAGS "${EXTRA_FLAGS} ${CMAKE_CXX_FLAGS} ${GENERAL} ${ENABLE_WARNINGS}") -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror -O0 -g -UNDEBUG") -set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -g0 -DNDEBUG") +set(GENERAL "-DSOL_EXCEPTIONS_SAFE_PROPAGATION") +set(CMAKE_CXX_FLAGS "${EXTRA_FLAGS} ${CMAKE_CXX_FLAGS} ${GENERAL}") +set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -UNDEBUG") +set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG") +if(NOT MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror -O0 -g") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -g0") +endif() #---------- # INSTALL - diff --git a/appveyor.yml b/appveyor.yml index 8bda8f1..c8aa3a2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,25 @@ image: Visual Studio 2015 -build: off +configuration: + - Debug + - Release -test_script: -- cmd: >- - ci/test_all.bat \ No newline at end of file +environment: + matrix: + - LUA: "lua 5.1" + - LUA: "lua 5.2" + - LUA: "lua 5.3" + - LUA: "luajit 2.0" + - LUA: "luajit 2.1" + +before_build: + - git submodule update --init --recursive + - pip install hererocks + - hererocks env --%LUA% -rlatest + - call env\bin\activate + +build_script: + - cmake . -G "Visual Studio 14 2015 Win64" + - cmake --build . --config %CONFIGURATION% + +test: off \ No newline at end of file