BUFIX: CMake files now support VS 2015 (8670997c) · Commits · CAMP / campvis-public

cmake/FindTBB.cmake

+3 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,8 @@ IF (WIN32)
		SET(TbbCompilerDirectory "vc11")
		ELSEIF(CAMPVIS_MSVC12)
		SET(TbbCompilerDirectory "vc12")
		ELSEIF(CAMPVIS_MSVC14)
		SET(TbbCompilerDirectory "vc14")
		ELSE()
		MESSAGE(WARNING "Compiler not supported by makefile, you might be able to fix that...")
		ENDIF(CAMPVIS_MSVC2010)

+6 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,10 @@ ELSEIF(${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 Win64" OR ${CMAKE_GENERATOR
		SET(CAMPVIS_MSVC12 TRUE)
		SET(CAMPVIS_WIN64 TRUE)
		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")
		SET(CAMPVIS_NMAKE TRUE)

		@@ -67,6 +71,8 @@ ELSEIF(${CMAKE_GENERATOR} MATCHES "NMake")
		SET(CAMPVIS_MSVC11 TRUE)
		ELSEIF(MSVC12)
		SET(CAMPVIS_MSVC12 TRUE)
		ELSEIF(MSVC14)
		SET(CAMPVIS_MSVC14 TRUE)
		ENDIF(MSVC90)

		IF(CMAKE_CL_64)