Added TBB support for MSVC12 / Visual Studio 2013

Also fixed a couple of whitespace alignment discrepancies in the cmake script.
This commit is contained in:
David G. Yu 2015-05-19 23:52:51 -07:00
parent e42885a4cc
commit 204425b20c

View File

@ -69,13 +69,13 @@ set (TBB_LIB_ARCH "")
if (WIN32)
if ("${CMAKE_GENERATOR}" MATCHES "[Ww]in64")
if ("${CMAKE_GENERATOR}" MATCHES "[Ww]in64")
set(WINPATH intel64)
else ()
set(WINPATH ia32)
endif()
if (MSVC80)
if (MSVC80)
set(WINPATH "${WINPATH}/vc8")
elseif (MSVC90)
set(WINPATH "${WINPATH}/vc9")
@ -83,6 +83,8 @@ if (WIN32)
set(WINPATH "${WINPATH}/vc10")
elseif (MSVC11)
set(WINPATH "${WINPATH}/vc11")
elseif (MSVC12)
set(WINPATH "${WINPATH}/vc12")
endif()
list(APPEND TBB_LIB_ARCH ${WINPATH})