diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-06-16 09:14:51 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-06-16 09:14:51 +0000 |
| commit | 98089f41bb388dba7e01191e49ded3c00028030c (patch) | |
| tree | e97d13fd643f9d72a7305183bb3b8427afecb201 /src/cmake | |
| parent | 07bd2d688df7595c04c2f669d2fceefebe4c215f (diff) | |
Fix find TBB package for msvc 2015
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/tbb_msvc2015@1301 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: a76105ff52729d8170eb88f5a5cbbce06b65b0ad
Diffstat (limited to 'src/cmake')
| -rw-r--r-- | src/cmake/modules/FindTBB.cmake | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/cmake/modules/FindTBB.cmake b/src/cmake/modules/FindTBB.cmake index a29c6d9c..13f4d929 100644 --- a/src/cmake/modules/FindTBB.cmake +++ b/src/cmake/modules/FindTBB.cmake @@ -107,11 +107,7 @@ if (WIN32) endif(MSVC12) #note there was no MSVC13 if(MSVC14) - if(RUNNING_CGAL_AUTO_TEST) - set (TBB_FOUND "NO") - return()#binaries for TBB not publicly available when CGAL-4.7 is published - endif(RUNNING_CGAL_AUTO_TEST) - message(STATUS "[Warning] FindTBB.cmake: TBB 4.4 (latest available when CGAL-4.7 is published) does not provide support for MSVC 2015.") + set(_TBB_COMPILER "vc14") endif(MSVC14) # Todo: add other Windows compilers such as ICL. set(_TBB_ARCHITECTURE ${TBB_ARCHITECTURE}) @@ -218,11 +214,7 @@ macro(TBB_CORRECT_LIB_DIR var_name) string(REPLACE em64t "${_TBB_ARCHITECTURE}" ${var_name} ${${var_name}}) # endif (NOT "${_TBB_ARCHITECTURE}" STREQUAL "em64t") string(REPLACE ia32 "${_TBB_ARCHITECTURE}" ${var_name} ${${var_name}}) - string(REPLACE vc7.1 "${_TBB_COMPILER}" ${var_name} ${${var_name}}) - string(REPLACE vc8 "${_TBB_COMPILER}" ${var_name} ${${var_name}}) - string(REPLACE vc9 "${_TBB_COMPILER}" ${var_name} ${${var_name}}) - string(REPLACE vc10 "${_TBB_COMPILER}" ${var_name} ${${var_name}}) - string(REPLACE vc11 "${_TBB_COMPILER}" ${var_name} ${${var_name}}) + string(REGEX REPLACE "vc[0-9]+(\.[0-9]+)?" "${_TBB_COMPILER}" ${var_name} ${${var_name}}) endmacro(TBB_CORRECT_LIB_DIR var_content) |