Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
9.2.2023: Due to updates GitLab will be unavailable for some minutes between 9:00 and 11:00.
Open sidebar
CAMP
campvis-public
Commits
06306ff7
Commit
06306ff7
authored
Feb 22, 2014
by
Christian Schulte zu Berge
Browse files
Merge branch 'development' of campcloud.informatik.tu-muenchen.de:berge/campvis into development
parents
8ccb1080
0459b1c9
Changes
4
Hide whitespace changes
Inline
Side-by-side
README.md
View file @
06306ff7
...
...
@@ -13,9 +13,9 @@ CAMPVis a software platform for medical imaging and visualization. It is targete
### Code & Build Status
*
[

](http://campci.informatik.tu-muenchen.de:8090/job/
CAMPVis
/)
*
[

](http://campci.informatik.tu-muenchen.de:8090/job/
CAMPV
is-cppcheck/cppcheckResult/)
*
[

](http://campci.informatik.tu-muenchen.de:8090/job/
CAMPVis
/sloccountResult/)
*
[

](http://campci.informatik.tu-muenchen.de:8090/job/
campvis-jobs/job/campvis-gcc
/)
*
[

](http://campci.informatik.tu-muenchen.de:8090/job/
campvis-jobs/job/campv
is-cppcheck/cppcheckResult/)
*
[

](http://campci.informatik.tu-muenchen.de:8090/job/
campvis-jobs/job/campvis-gcc
/sloccountResult/)
### Requirements
...
...
cmake/FindTBB.cmake
View file @
06306ff7
...
...
@@ -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
)
...
...
cmake/commonconf.cmake
View file @
06306ff7
...
...
@@ -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
)
...
...
ext/tgt/gpucapabilities.cpp
View file @
06306ff7
...
...
@@ -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_
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment