forked from brndnmtthws/conky
-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add toluapp subtree (brndnmtthws#712)
* First commit! * Import to git * Droping down CMake requirement * Corrected installation of libraries * Adding travis build * Updated cmake macros * Fixed find package * Updated travis hook * Updated travis hook * Patch to support Lua 5.3. * Fix Lua header include directives in tolua++.h Use angle bracket rather than double quotes when including Lua headers in the tolua++ header. This fixes a problem on systems that default to a Lua version newer than 5.1 and install the tolua++ header to the same directory as newer Lua headers. As there are (usually) no Lua headers in the same directory when building tolua++ itself, the preprocessor will look to the include directories passed to the compiler, one of which would be the Lua 5.1 include directory, and tolua++ will build with those (correct) headers. Then the tolua++ header is usually installed in the default include directory, alongside the newer Lua headers, which you wouldn't expect to cause any trouble. But it does cause trouble when trying to build other programs that include the tolua++ header, because now the preprocessor does find Lua headers in the same directory as the tolua++ header, which are the newer (incorrect) headers. Now the program will either fail to compile, because it doesn't support the newer headers, or fail to link with the tolua++ shared object because they were compiled against different Lua headers. Using angle brackets instead of double quotes in the include directives will fix the problem, because then the preprocessor will look to the include directories passed to the compiler first. See http://www.cegui.org.uk/forum/viewtopic.php?f=10&t=7195 * Remove email notifications. * Update travis build. * Build shared and static libs. * Patch toluapp to support Lua 5.3. With this change, support for Lua 5.1 is dropped. This resolve brndnmtthws#116. * Add some comments to clarify the toluapp handling. * Add minor sonar fix.
- Loading branch information
1 parent
3a30929
commit bb8723d
Showing
131 changed files
with
31,223 additions
and
177 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| language: cpp | ||
| cache: ccache | ||
| dist: xenial | ||
| matrix: | ||
| include: | ||
| - os: linux | ||
| addons: | ||
| apt: | ||
| sources: | ||
| - ubuntu-toolchain-r-test | ||
| packages: | ||
| - g++-5 | ||
| - liblua5.3-dev | ||
| env: | ||
| - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5" | ||
| - os: linux | ||
| addons: | ||
| apt: | ||
| sources: | ||
| - ubuntu-toolchain-r-test | ||
| packages: | ||
| - g++-6 | ||
| - liblua5.3-dev | ||
| env: | ||
| - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6" | ||
| - os: linux | ||
| addons: | ||
| apt: | ||
| sources: | ||
| - ubuntu-toolchain-r-test | ||
| packages: | ||
| - g++-7 | ||
| - liblua5.3-dev | ||
| env: | ||
| - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" | ||
| - os: linux | ||
| addons: | ||
| apt: | ||
| sources: | ||
| - ubuntu-toolchain-r-test | ||
| packages: | ||
| - g++-8 | ||
| - liblua5.3-dev | ||
| env: | ||
| - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" | ||
| - os: linux | ||
| addons: | ||
| apt: | ||
| sources: | ||
| - llvm-toolchain-xenial-6.0 | ||
| packages: | ||
| - clang-6.0 | ||
| - liblua5.3-dev | ||
| env: | ||
| - MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0" | ||
| - os: linux | ||
| addons: | ||
| apt: | ||
| sources: | ||
| - llvm-toolchain-xenial-7 | ||
| packages: | ||
| - clang-7 | ||
| - liblua5.3-dev | ||
| env: | ||
| - MATRIX_EVAL="CC=clang-7 && CXX=clang++-7" | ||
| - os: osx | ||
| osx_image: xcode9.4 | ||
| - os: osx | ||
| osx_image: xcode10 | ||
| - os: osx | ||
| osx_image: xcode10.1 | ||
|
|
||
| before_install: | ||
| - | | ||
| if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then | ||
| brew update; | ||
| brew install lua ccache; | ||
| export PATH="/usr/local/opt/ccache/libexec:$PATH"; | ||
| fi | ||
| - eval "${MATRIX_EVAL}" | ||
| # Combine global build options with OS/compiler-dependent options | ||
| - export CMAKE_OPTIONS="${CMAKE_OPTIONS} ${ENV_CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache" | ||
| - export CXX_FLAGS="${CXX_FLAGS} ${ENV_CXX_FLAGS}" | ||
|
|
||
| install: | ||
| - echo ${PATH} | ||
| - echo ${CXX} | ||
| - ${CXX} --version | ||
| - ${CXX} -v | ||
|
|
||
| script: | ||
| - mkdir -p build | ||
| - cd build | ||
| - cmake ${CMAKE_OPTIONS} -DCMAKE_CXX_FLAGS=${CXX_FLAGS} .. | ||
| - make -j4 | ||
|
|
||
| # Only watch the master branch | ||
| branches: | ||
| only: | ||
| - master |
Oops, something went wrong.