The expiration time for new job artifacts in CI/CD pipelines is now 30 days (GitLab default). Previously generated artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit 06306ff7 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Merge branch 'development' of campcloud.informatik.tu-muenchen.de:berge/campvis into development

parents 8ccb1080 0459b1c9
......@@ -13,9 +13,9 @@ CAMPVis a software platform for medical imaging and visualization. It is targete
### Code & Build Status
* [![Build Status](http://campci.informatik.tu-muenchen.de:8090/buildStatus/icon?job=CAMPVis)](http://campci.informatik.tu-muenchen.de:8090/job/CAMPVis/)
* [![Cppcheck Trend](http://campci.informatik.tu-muenchen.de:8090/job/CAMPVis-cppcheck/cppcheckResult/graph)](http://campci.informatik.tu-muenchen.de:8090/job/CAMPVis-cppcheck/cppcheckResult/)
* [![LOC Trend](http://campci.informatik.tu-muenchen.de:8090/job/CAMPVis/sloccountResult/trend)](http://campci.informatik.tu-muenchen.de:8090/job/CAMPVis/sloccountResult/)
* [![Build Status](http://campci.informatik.tu-muenchen.de:8090/buildStatus/icon?job=campvis-jobs/campvis-gcc)](http://campci.informatik.tu-muenchen.de:8090/job/campvis-jobs/job/campvis-gcc/)
* [![Cppcheck Trend](http://campci.informatik.tu-muenchen.de:8090/job/campvis-jobs/job/campvis-cppcheck/cppcheckResult/graph)](http://campci.informatik.tu-muenchen.de:8090/job/campvis-jobs/job/campvis-cppcheck/cppcheckResult/)
* [![LOC Trend](http://campci.informatik.tu-muenchen.de:8090/job/campvis-jobs/job/campvis-gcc/sloccountResult/trend)](http://campci.informatik.tu-muenchen.de:8090/job/campvis-jobs/job/campvis-gcc/sloccountResult/)
### Requirements
......
......@@ -32,6 +32,8 @@ IF (WIN32)
SET(TbbCompilerDirectory "vc10")
ELSEIF(CAMPVIS_MSVC11)
SET(TbbCompilerDirectory "vc11")
ELSEIF(CAMPVIS_MSVC12)
SET(TbbCompilerDirectory "vc12")
ELSE()
MESSAGE(WARNING "Compiler not supported by makefile, you might be able to fix that...")
ENDIF(CAMPVIS_MSVC2010)
......
......@@ -28,11 +28,19 @@ ELSEIF(${CMAKE_GENERATOR} STREQUAL "Visual Studio 10 Win64")
ELSEIF(${CMAKE_GENERATOR} STREQUAL "Visual Studio 11")
SET(CAMPVIS_MSVC11 TRUE)
SET(CAMPVIS_WIN32 TRUE)
MESSAGE("Visual Studio 11 Build (32 Bit) (not actively supported)")
MESSAGE("Visual Studio 11 Build (32 Bit)")
ELSEIF(${CMAKE_GENERATOR} STREQUAL "Visual Studio 11 Win64")
SET(CAMPVIS_MSVC11 TRUE)
SET(CAMPVIS_WIN64 TRUE)
MESSAGE("Visual Studio 11 Build (64 Bit) (not actively supported)")
MESSAGE("Visual Studio 11 Build (64 Bit)")
ELSEIF(${CMAKE_GENERATOR} STREQUAL "Visual Studio 12")
SET(CAMPVIS_MSVC12 TRUE)
SET(CAMPVIS_WIN32 TRUE)
MESSAGE("Visual Studio 12 Build (32 Bit)")
ELSEIF(${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 Win64")
SET(CAMPVIS_MSVC12 TRUE)
SET(CAMPVIS_WIN64 TRUE)
MESSAGE("Visual Studio 12 Build (64 Bit)")
ELSEIF(${CMAKE_GENERATOR} MATCHES "NMake")
SET(CAMPVIS_NMAKE TRUE)
......@@ -43,6 +51,8 @@ ELSEIF(${CMAKE_GENERATOR} MATCHES "NMake")
SET(CAMPVIS_MSVC2010 TRUE)
ELSEIF(MSVC11)
SET(CAMPVIS_MSVC11 TRUE)
ELSEIF(MSVC12)
SET(CAMPVIS_MSVC12 TRUE)
ENDIF(MSVC90)
IF(CMAKE_CL_64)
......
......@@ -212,7 +212,7 @@ void GpuCapabilities::logCapabilities(bool extensionsString, bool osString) {
features.str("");
features << "Shaders: " << (areShadersSupported() ? "yes (OpenGL 2.0)" : "no");
if (!areShadersSupported()) {
LINFO(features);
LINFO(features.str());
}
else {
features << ", GLSL Version " << shaderVersion_;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment