Loading CMakeLists.txt +2 −1 Original line number Diff line number Diff line # = CAMPVis - Yet another medical visualization framework ===================== PROJECT(CAMPVis) CMAKE_MINIMUM_REQUIRED(VERSION 3.0.2 FATAL_ERROR) cmake_policy(SET CMP0020 NEW) PROJECT(CAMPVis) SET(CAMPVIS_VERSION 1.0.0) # = Global Build Options ====================================================== Loading cmake/FindTBB.cmake +2 −0 Original line number Diff line number Diff line Loading @@ -36,6 +36,8 @@ IF (WIN32) SET(TbbCompilerDirectory "vc12") ELSEIF(CAMPVIS_MSVC14) SET(TbbCompilerDirectory "vc14") ELSEIF(CAMPVIS_MSVC15) SET(TbbCompilerDirectory "vc14") ELSE() MESSAGE(WARNING "Compiler not supported by makefile, you might be able to fix that...") ENDIF(CAMPVIS_MSVC2010) Loading cmake/commonconf.cmake +5 −1 Original line number Diff line number Diff line Loading @@ -58,7 +58,11 @@ ELSEIF(${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 Win64" OR ${CMAKE_GENERATOR ELSEIF(${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 Win64" OR ${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015 Win64") SET(CAMPVIS_MSVC14 TRUE) SET(CAMPVIS_WIN64 TRUE) MESSAGE("Visual Studio 12 Build (64 Bit)") MESSAGE("Visual Studio 14 Build (64 Bit)") ELSEIF(${CMAKE_GENERATOR} STREQUAL "Visual Studio 15 Win64" OR ${CMAKE_GENERATOR} STREQUAL "Visual Studio 15 2017 Win64") SET(CAMPVIS_MSVC15 TRUE) SET(CAMPVIS_WIN64 TRUE) MESSAGE("Visual Studio 15 Build (64 Bit)") ELSEIF(${CMAKE_GENERATOR} MATCHES "NMake") SET(CAMPVIS_NMAKE TRUE) Loading core/properties/colorproperty.h +3 −3 Original line number Diff line number Diff line Loading @@ -64,9 +64,9 @@ namespace campvis { const std::string& name, const std::string& title, const T& value, const T& minValue = T(0.0f), const T& maxValue = T(1.0f), const T& stepValue = T(0.01f)) const T& minValue, const T& maxValue, const T& stepValue) : Vec4Property(name, title, value, minValue, maxValue, stepValue) { Loading ext/cgt/CMakeLists.txt +1 −0 Original line number Diff line number Diff line Loading @@ -29,6 +29,7 @@ SET(CGT_SOURCES frustum.cpp glcanvas.cpp glcontextmanager.cpp gltextureformattraits.cpp gpucapabilities.cpp gpucapabilitieswindows.cpp imageunit.cpp Loading Loading
CMakeLists.txt +2 −1 Original line number Diff line number Diff line # = CAMPVis - Yet another medical visualization framework ===================== PROJECT(CAMPVis) CMAKE_MINIMUM_REQUIRED(VERSION 3.0.2 FATAL_ERROR) cmake_policy(SET CMP0020 NEW) PROJECT(CAMPVis) SET(CAMPVIS_VERSION 1.0.0) # = Global Build Options ====================================================== Loading
cmake/FindTBB.cmake +2 −0 Original line number Diff line number Diff line Loading @@ -36,6 +36,8 @@ IF (WIN32) SET(TbbCompilerDirectory "vc12") ELSEIF(CAMPVIS_MSVC14) SET(TbbCompilerDirectory "vc14") ELSEIF(CAMPVIS_MSVC15) SET(TbbCompilerDirectory "vc14") ELSE() MESSAGE(WARNING "Compiler not supported by makefile, you might be able to fix that...") ENDIF(CAMPVIS_MSVC2010) Loading
cmake/commonconf.cmake +5 −1 Original line number Diff line number Diff line Loading @@ -58,7 +58,11 @@ ELSEIF(${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 Win64" OR ${CMAKE_GENERATOR ELSEIF(${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 Win64" OR ${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015 Win64") SET(CAMPVIS_MSVC14 TRUE) SET(CAMPVIS_WIN64 TRUE) MESSAGE("Visual Studio 12 Build (64 Bit)") MESSAGE("Visual Studio 14 Build (64 Bit)") ELSEIF(${CMAKE_GENERATOR} STREQUAL "Visual Studio 15 Win64" OR ${CMAKE_GENERATOR} STREQUAL "Visual Studio 15 2017 Win64") SET(CAMPVIS_MSVC15 TRUE) SET(CAMPVIS_WIN64 TRUE) MESSAGE("Visual Studio 15 Build (64 Bit)") ELSEIF(${CMAKE_GENERATOR} MATCHES "NMake") SET(CAMPVIS_NMAKE TRUE) Loading
core/properties/colorproperty.h +3 −3 Original line number Diff line number Diff line Loading @@ -64,9 +64,9 @@ namespace campvis { const std::string& name, const std::string& title, const T& value, const T& minValue = T(0.0f), const T& maxValue = T(1.0f), const T& stepValue = T(0.01f)) const T& minValue, const T& maxValue, const T& stepValue) : Vec4Property(name, title, value, minValue, maxValue, stepValue) { Loading
ext/cgt/CMakeLists.txt +1 −0 Original line number Diff line number Diff line Loading @@ -29,6 +29,7 @@ SET(CGT_SOURCES frustum.cpp glcanvas.cpp glcontextmanager.cpp gltextureformattraits.cpp gpucapabilities.cpp gpucapabilitieswindows.cpp imageunit.cpp Loading