Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Project_Phoenix
- Activity
- Members
- Labels
- Wiki
- Terraform modules

Snippets Groups Projects

2cc53e4d

Commit 2cc53e4d authored Sep 5, 2017 by Sebastian Freitag

Downloads
- Plain Diff

Merge branch 'feature/#69_OpenGl_Mock_Failing_MSVS' into 'develop'

Feature/#69 open gl mock failing msvs

See merge request !17

parents 01538274 0ac54fff

Branches

Tags

2 merge requests!19Release/v17.09.0,!17Feature/#69 open gl mock failing msvs

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 1 addition, 2 deletions

.gitlab-ci.yml
CMakeLists.txt 1 addition, 0 deletions

CMakeLists.txt
cmake/Testing.cmake 1 addition, 1 deletion

cmake/Testing.cmake
conanfile.py 17 additions, 0 deletions

conanfile.py
library/CMakeLists.txt 3 additions, 3 deletions

library/CMakeLists.txt
tests/CMakeLists.txt 12 additions, 21 deletions

tests/CMakeLists.txt
tests/src/test_geometry_pass.cpp 8 additions, 7 deletions

tests/src/test_geometry_pass.cpp

with 43 additions and 34 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment