Starting from 2021-07-01, all LRZ GitLab users will be required to explicitly accept the GitLab Terms of Service. Please see the detailed information at https://doku.lrz.de/display/PUBLIC/GitLab and make sure that your projects conform to the requirements.

Commit 8670997c authored by Jakob Weiss's avatar Jakob Weiss
Browse files

BUFIX: CMake files now support VS 2015

parent a4b588c4
...@@ -34,6 +34,8 @@ IF (WIN32) ...@@ -34,6 +34,8 @@ IF (WIN32)
SET(TbbCompilerDirectory "vc11") SET(TbbCompilerDirectory "vc11")
ELSEIF(CAMPVIS_MSVC12) ELSEIF(CAMPVIS_MSVC12)
SET(TbbCompilerDirectory "vc12") SET(TbbCompilerDirectory "vc12")
ELSEIF(CAMPVIS_MSVC14)
SET(TbbCompilerDirectory "vc14")
ELSE() ELSE()
MESSAGE(WARNING "Compiler not supported by makefile, you might be able to fix that...") MESSAGE(WARNING "Compiler not supported by makefile, you might be able to fix that...")
ENDIF(CAMPVIS_MSVC2010) ENDIF(CAMPVIS_MSVC2010)
......
...@@ -55,6 +55,10 @@ ELSEIF(${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 Win64" OR ${CMAKE_GENERATOR ...@@ -55,6 +55,10 @@ ELSEIF(${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 Win64" OR ${CMAKE_GENERATOR
SET(CAMPVIS_MSVC12 TRUE) SET(CAMPVIS_MSVC12 TRUE)
SET(CAMPVIS_WIN64 TRUE) SET(CAMPVIS_WIN64 TRUE)
MESSAGE("Visual Studio 12 Build (64 Bit)") MESSAGE("Visual Studio 12 Build (64 Bit)")
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)")
ELSEIF(${CMAKE_GENERATOR} MATCHES "NMake") ELSEIF(${CMAKE_GENERATOR} MATCHES "NMake")
SET(CAMPVIS_NMAKE TRUE) SET(CAMPVIS_NMAKE TRUE)
...@@ -67,6 +71,8 @@ ELSEIF(${CMAKE_GENERATOR} MATCHES "NMake") ...@@ -67,6 +71,8 @@ ELSEIF(${CMAKE_GENERATOR} MATCHES "NMake")
SET(CAMPVIS_MSVC11 TRUE) SET(CAMPVIS_MSVC11 TRUE)
ELSEIF(MSVC12) ELSEIF(MSVC12)
SET(CAMPVIS_MSVC12 TRUE) SET(CAMPVIS_MSVC12 TRUE)
ELSEIF(MSVC14)
SET(CAMPVIS_MSVC14 TRUE)
ENDIF(MSVC90) ENDIF(MSVC90)
IF(CMAKE_CL_64) IF(CMAKE_CL_64)
......
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