Commit 3a2fa399 authored by Jakob Weiss's avatar Jakob Weiss Committed by Michael Sommersperger
Browse files

Necessary fixes for VS 2017 build

parent 59d1c4fb
Loading
Loading
Loading
Loading
+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 ======================================================
+2 −0
Original line number Diff line number Diff line
@@ -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)
+5 −1
Original line number Diff line number Diff line
@@ -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)

+3 −3
Original line number Diff line number Diff line
@@ -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)
    {

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ SET(CGT_SOURCES
	frustum.cpp
	glcanvas.cpp
	glcontextmanager.cpp
	gltextureformattraits.cpp
	gpucapabilities.cpp
	gpucapabilitieswindows.cpp
	imageunit.cpp
Loading