From 5b072b591e9e75f3be9e122c7c3759a3f2c644f7 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 9 Aug 2017 18:41:34 -0700 Subject: [PATCH] remove commas breaking MSVC dir setting --- cmake/externals/tbb/CMakeLists.txt | 6 +++--- cmake/modules/FindTBB.cmake | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/externals/tbb/CMakeLists.txt b/cmake/externals/tbb/CMakeLists.txt index eef2cddd05..c0f2ef5c82 100644 --- a/cmake/externals/tbb/CMakeLists.txt +++ b/cmake/externals/tbb/CMakeLists.txt @@ -49,11 +49,11 @@ if (APPLE) ) elseif (WIN32) if ("${MSVC_VERSION}" EQUAL "1700") - set(_TBB_MSVC_DIR, "vc11") + set(_TBB_MSVC_DIR "vc11") elseif ("${MSVC_VERSION}" EQUAL "1800") - set(_TBB_MSVC_DIR, "vc12") + set(_TBB_MSVC_DIR "vc12") elseif ("${MSVC_VERSION}" EQUAL "1900" OR "${MSVC_VERSION}" EQUAL "1910") - set(_TBB_MSVC_DIR, "vc14") + set(_TBB_MSVC_DIR "vc14") else() message(FATAL_ERROR "MSVC ${MSVC_VERSION} not supported by Intel TBB") endif() diff --git a/cmake/modules/FindTBB.cmake b/cmake/modules/FindTBB.cmake index 602dbf79ae..9a7fbd7c10 100644 --- a/cmake/modules/FindTBB.cmake +++ b/cmake/modules/FindTBB.cmake @@ -58,11 +58,11 @@ elseif (WIN32) endif() if ("${MSVC_VERSION}" EQUAL "1700") - set(_TBB_MSVC_DIR, "vc11") + set(_TBB_MSVC_DIR "vc11") elseif ("${MSVC_VERSION}" EQUAL "1800") - set(_TBB_MSVC_DIR, "vc12") + set(_TBB_MSVC_DIR "vc12") elseif ("${MSVC_VERSION}" EQUAL "1900" OR "${MSVC_VERSION}" EQUAL "1910") - set(_TBB_MSVC_DIR, "vc14") + set(_TBB_MSVC_DIR "vc14") else() message(FATAL_ERROR "MSVC ${MSVC_VERSION} not supported by Intel TBB") endif()