Permalink
Browse files

Merge pull request #17 from UniStuttgart-VISUS/ci

AppVeyor CI with VS2017 and Travis-CI build matrix
  • Loading branch information...
gralkapk committed Apr 14, 2018
2 parents aa5a083 + c4812f0 commit 0f2bd85a822561c571809e2843047a553b81b641
Showing with 69 additions and 16 deletions.
  1. +67 −2 .travis.yml
  2. +2 −2 Readme.md
  3. +0 −4 ci/build.ps1
  4. +0 −8 ci/build.sh
View
@@ -1,5 +1,67 @@
language: generic
git:
depth: 1
matrix:
include:
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-5
env:
- CC=gcc-5
- CXX=g++-5
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-6
env:
- CC=gcc-6
- CXX=g++-6
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-7
env:
- CC=gcc-7
- CXX=g++-7
- os: linux
addons:
apt:
sources:
- llvm-toolchain-trusty-5.0
- ubuntu-toolchain-r-test
packages:
- clang-5.0
env:
- CC=clang-5.0
- CXX=clang++-5.0
- os: linux
addons:
apt:
sources:
- llvm-toolchain-trusty-6.0
- ubuntu-toolchain-r-test
packages:
- clang-6.0
env:
- CC=clang-6.0
- CXX=clang++-6.0
before_install:
- sudo apt-get -qq update
- sudo apt-get install -y uuid-dev
@@ -8,7 +70,10 @@ before_install:
- sudo apt-get install -y libxinerama-dev
- sudo apt-get install -y libxcursor-dev
- sudo apt-get install -y libxi-dev
- mkdir build
- cd build
- cmake ..
script:
- ci/build.sh
install:
- make install
View
@@ -1,7 +1,7 @@
![](logo.png)
[![Build Status Travis](https://travis-ci.org/UniStuttgart-VISUS/megamol.svg?branch=master)](https://travis-ci.org/UniStuttgart-VISUS/megamol)
[![Build Status AppVeyor](https://ci.appveyor.com/api/projects/status/github/UniStuttgart-VISUS/megamol?branch=master&svg=true)](https://ci.appveyor.com/api/projects/status/github/UniStuttgart-VISUS/megamol)
[![Build Status AppVeyor](https://ci.appveyor.com/api/projects/status/github/UniStuttgart-VISUS/megamol?branch=master&svg=true)](https://ci.appveyor.com/project/megamolservice/megamol)
MegaMol is a visualization middleware used to visualize point-based molecular data sets. This software is developed within the ​Collaborative Research Center 716, subproject ​D.3 at the ​[Visualization Research Center (VISUS)](https://www.visus.uni-stuttgart.de/institut.html) of the University of Stuttgart and at the ​Computer Graphics and Visualization Group of the TU Dresden.
MegaMol succeeds [​MolCloud](http://www.visus.uni-stuttgart.de/institut/personen/wissenschaftliche-mitarbeiter/sebastian-grottel/molcloud.html), which has been developed at the University of Stuttgart in order to visualize point-based data sets. MegaMol is written in C++, and uses an OpenGL as Rendering-API and GLSL-Shader. It supports the operating systems Microsoft Windows and Linux, each in 32-bit and 64-bit versions. In large parts, MegaMol is based on [VISlib](https://svn.vis.uni-stuttgart.de/trac/vislib), a C++-class library for scientific visualization, which has also been developed at the University of Stuttgart.
@@ -112,4 +112,4 @@ In Proceedings of IEEE Pacific Visualization Symposium 2009: 65 - 72, 2009
key = "megamol",
url = {http://megamol.org},
note = {{MegaMol project website \url{http://megamol.org}}},
}
}
View

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.

0 comments on commit 0f2bd85

Please sign in to comment.