-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #361 from cgogn/develop
Develop
- Loading branch information
Showing
1,090 changed files
with
11,705 additions
and
331,068 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| language: cpp | ||
|
|
||
| matrix: | ||
| include: | ||
| - os: linux | ||
| sudo: required | ||
| dist: trusty | ||
| - os: osx | ||
| osx_image: xcode10 | ||
|
|
||
| addons: | ||
| apt: | ||
| sources: | ||
| - ubuntu-toolchain-r-test | ||
| - sourceline: "ppa:beineri/opt-qt58-trusty" | ||
| - sourceline: "ppa:corentinjabot/cmake-backport" #cmake 3.7.2 | ||
| # for cmake 3.12 use ppa:dluxen/cmake-backports | ||
| - sourceline: "ppa:nschloe/eigen-backports" #eigen 3.3.2 | ||
| packages: | ||
| - gcc-5 | ||
| - g++-5 | ||
| - libglu1-mesa-dev | ||
| - qt58base | ||
| - cmake | ||
| - libeigen3-dev | ||
| - libtinyxml2-dev/trusty-backports | ||
| homebrew: | ||
| packages: | ||
| - qt5 | ||
| - eigen | ||
| - tinyxml2 | ||
|
|
||
| script: | ||
| - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then | ||
| source /opt/qt58/bin/qt58-env.sh ; | ||
| fi | ||
|
|
||
| branches: | ||
| only: | ||
| - develop | ||
|
|
||
| script: | ||
| - mkdir build | ||
| - cd build | ||
| - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then | ||
| cmake .. | ||
| -DCMAKE_CXX_COMPILER=g++-5 | ||
| -DCMAKE_C_COMPILER=gcc-5 | ||
| -DCGOGN_BUILD_TESTS:BOOL=ON | ||
| -DCGOGN_BUILD_EXAMPLES:BOOL=ON ; | ||
| fi | ||
| - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then | ||
| cmake .. | ||
| -DCMAKE_PREFIX_PATH:PATH=$(brew --prefix qt) | ||
| -DCGOGN_BUILD_TESTS:BOOL=ON | ||
| -DCGOGN_BUILD_EXAMPLES:BOOL=ON ; | ||
| fi | ||
| - make -j2 | ||
| - make test | ||
| - sudo make install |
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,68 @@ | ||
| #---------------------------------# | ||
| # general configuration # | ||
| #---------------------------------# | ||
|
|
||
| # version format | ||
| version: 1.0.{build} | ||
|
|
||
| branches: | ||
| only: | ||
| - develop | ||
| - test_attributes | ||
|
|
||
| skip_commits: | ||
| message: /\[skip ci\]|\[ci skip\]|\[skip appveyor\]|\[ci appveyor\]/ | ||
| files: | ||
| - .travis* | ||
| - data/ | ||
| - '*.md' | ||
|
|
||
| clone_folder: c:\projects\myproject | ||
|
|
||
| # fetch repository as zip archive | ||
| shallow_clone: true | ||
|
|
||
| image: | ||
| - Visual Studio 2015 | ||
| - Visual Studio 2017 | ||
|
|
||
| configuration: | ||
| - Release | ||
| - Debug | ||
|
|
||
| environment: | ||
| CMAKE_TOOLCHAIN_FILE: -DCMAKE_TOOLCHAIN_FILE="C:\tools\vcpkg\scripts\buildsystems\vcpkg.cmake" | ||
| matrix: | ||
| - arch: x64 | ||
|
|
||
| build: | ||
| parallel: true | ||
| verbosity: minimal | ||
|
|
||
| # skip unsupported combinations | ||
| init: | ||
| - echo %arch% | ||
| - echo %APPVEYOR_BUILD_WORKER_IMAGE% | ||
| - if "%arch%"=="x64" (set TARGET_PLATFORM= Win64) | ||
| - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (set GENERATOR="Visual Studio 15 2017%TARGET_PLATFORM%" && set QT_DIR="C:\Qt\5.10.1\msvc2017_64\lib\cmake\Qt5") | ||
| - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (set GENERATOR="Visual Studio 14 2015%TARGET_PLATFORM%" && set QT_DIR="C:\Qt\5.10.1\msvc2015_64\lib\cmake\Qt5") | ||
| - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2013" (set GENERATOR="Visual Studio 12 2013%TARGET_PLATFORM%" && set QT_DIR="C:\Qt\5.8\msvc2013_64\lib\cmake\Qt5") | ||
| - echo %GENERATOR% | ||
| - echo %QT_DIR% | ||
|
|
||
| install: | ||
| - vcpkg remove --outdated --recurse | ||
| - vcpkg install --recurse | ||
| zlib | ||
| eigen3 | ||
| tinyxml2 | ||
| --triplet %arch%-windows | ||
|
|
||
| build_script: | ||
| - md build | ||
| - cd build | ||
| - cmake --version | ||
| - cmake -Wno-dev -Wno-deprecated -G %GENERATOR% .. -DCMAKE_SUPPRESS_REGENERATION=1 %CMAKE_TOOLCHAIN_FILE% -DQt5_DIR=%QT_DIR% -DCGOGN_BUILD_TESTS=ON -DCGOGN_BUILD_EXAMPLES=ON | ||
| - cmake --build . --config "%CONFIGURATION%" -- /verbosity:minimal | ||
| - cmake --build . --config "%CONFIGURATION%" --target RUN_TESTS -- /verbosity:minimal | ||
| - cmake --build . --config "%CONFIGURATION%" --target INSTALL -- /verbosity:minimal |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.