aboutsummaryrefslogtreecommitdiff
path: root/ports/tbb
diff options
context:
space:
mode:
authorGriffin Downs <35574547+grdowns@users.noreply.github.com>2019-04-08 10:52:14 -0700
committerGitHub <noreply@github.com>2019-04-08 10:52:14 -0700
commitb49c739129dfbc6a13e2881494084119fc221a5e (patch)
treee43a7dbd5b082bcda3f907933d143d00f40f44b0 /ports/tbb
parentfb47d74d6d6d6f0c0497c8c9b50830b9b47f754c (diff)
parent97b7134f41b48963345ef3d6bdf950c8d569d43d (diff)
downloadvcpkg-b49c739129dfbc6a13e2881494084119fc221a5e.tar.gz
vcpkg-b49c739129dfbc6a13e2881494084119fc221a5e.zip
Merge pull request #5702 from kiwixz/pr/cmake_3_14
Update to cmake 3.14 (allow compilation with VS2019RC v142)
Diffstat (limited to 'ports/tbb')
-rw-r--r--ports/tbb/portfile.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake
index 3050a38a9..67056533a 100644
--- a/ports/tbb/portfile.cmake
+++ b/ports/tbb/portfile.cmake
@@ -59,6 +59,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
else()
set(TBB_DEFAULT_COMPONENTS tbb tbbmalloc tbbmalloc_proxy)
endif()
+
file(READ "${SOURCE_PATH}/include/tbb/tbb_stddef.h" _tbb_stddef)
string(REGEX REPLACE ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1" _tbb_ver_major "${_tbb_stddef}")
string(REGEX REPLACE ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1" _tbb_ver_minor "${_tbb_stddef}")