Skip to content

Commit

Permalink
Fix Travis CI. (#41)
Browse files Browse the repository at this point in the history
Also update build status badge URL.
  • Loading branch information
Oberon00 authored May 14, 2020
1 parent 60e576e commit 554249b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: cpp
sudo: false
os: linux
addons:
apt:
packages:
Expand All @@ -24,7 +24,7 @@ script:
..
- make
- CTEST_OUTPUT_ON_FAILURE=1 make test
matrix:
jobs:
# clang can only be used in C++98 mode with Travis' old boost version.
include:
- compiler: clang
Expand Down
9 changes: 8 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@ set(BUILD_SHARED_LIBS ${LUABIND_DYNAMIC_LINK})

if(LUABIND_USE_CXX11 AND LUABIND_CXX11_COMPILER_FLAGS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LUABIND_CXX11_COMPILER_FLAGS}")
elseif(NOT LUABIND_USE_CXX11 AND NOT MSVC)
check_cxx_compiler_flag(-std=c++98 LUABIND_HAS_CXX98FLAG)
if (LUABIND_HAS_CXX98FLAG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
endif()
endif()

# Test and enable warning flags if desired, as well as other compiler flag
Expand Down Expand Up @@ -189,6 +194,7 @@ else()
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
list(APPEND possible_flags
Weverything
Wno-unused-local-typedef
Wno-shadow
Wno-undef
Wno-global-constructors
Expand All @@ -199,6 +205,7 @@ else()

if(LUABIND_USE_CXX11)
list(APPEND possible_flags
Wno-zero-as-nullpointer
Wno-c++98-compat
Wno-c++98-compat-pedantic)
else()
Expand All @@ -223,7 +230,7 @@ endif()
include_directories(BEFORE
"${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}")
include_directories(AFTER
include_directories(AFTER SYSTEM
${Boost_INCLUDE_DIRS}
${LUA_INCLUDE_DIRS})

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Luabind
=======

[![Travis CI build status](https://travis-ci.org/Oberon00/luabind.svg?branch=master)](https://travis-ci.org/Oberon00/luabind)
[![Travis CI build status](https://travis-ci.com/Oberon00/luabind.svg?branch=master)](https://travis-ci.com/github/Oberon00/luabind)

Luabind is a library that helps you create bindings between C++ and Lua. It
has the ability to expose functions and classes, written in C++, to Lua. It
Expand Down

0 comments on commit 554249b

Please sign in to comment.