Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-05 22:42:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

compare MSVC version numerically with greater_equal

Browse source
This commit is contained in:
Stephen Birarda 2017-08-10 09:46:58 -07:00
parent c7edc98d5c
commit feef7dfec3
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmake/externals/tbb/CMakeLists.txt vendored
View file

@ -48,12 +48,12 @@ if (APPLE)
LOG 1
)
elseif (WIN32)
if ("${MSVC_VERSION}" EQUAL "1700")
set(_TBB_MSVC_DIR "vc11")
elseif ("${MSVC_VERSION}" EQUAL "1800")
set(_TBB_MSVC_DIR "vc12")
elseif ("${MSVC_VERSION}" EQUAL "1900" OR "${MSVC_VERSION}" EQUAL "1910")
if (MSVC_VERSION GREATER_EQUAL 1900)
set(_TBB_MSVC_DIR "vc14")
elseif (MSVC_VERSION GREATER_EQUAL 1800)
set(_TBB_MSVC_DIR "vc12")
elseif (MSVC_VERSION GREATER_EQUAL 1700)
set(_TBB_MSVC_DIR "vc11")
else()
message(FATAL_ERROR "MSVC ${MSVC_VERSION} not supported by Intel TBB")
endif()

10
cmake/modules/FindTBB.cmake
View file

@ -57,12 +57,12 @@ elseif (WIN32)
set(_TBB_ARCH_DIR "ia32")
endif()
if ("${MSVC_VERSION}" EQUAL "1700")
set(_TBB_MSVC_DIR "vc11")
elseif ("${MSVC_VERSION}" EQUAL "1800")
set(_TBB_MSVC_DIR "vc12")
elseif ("${MSVC_VERSION}" EQUAL "1900" OR "${MSVC_VERSION}" EQUAL "1910")
if (MSVC_VERSION GREATER_EQUAL 1900)
set(_TBB_MSVC_DIR "vc14")
elseif (MSVC_VERSION GREATER_EQUAL 1800)
set(_TBB_MSVC_DIR "vc12")
elseif (MSVC_VERSION GREATER_EQUAL 1700)
set(_TBB_MSVC_DIR "vc11")
else()
message(FATAL_ERROR "MSVC ${MSVC_VERSION} not supported by Intel TBB")
endif()