diff options
| author | Phoebe <925731795@qq.com> | 2019-04-08 23:23:31 -0700 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-04-08 23:23:31 -0700 |
| commit | 46bd973e1897c11da8bcb40b501fe46d431a6de0 (patch) | |
| tree | 5b905f306e425e1c0936cf86f80d17d097fd200e | |
| parent | 81ecf512ac90a0905b95ed34ed95adb7bb70ee9b (diff) | |
| download | vcpkg-46bd973e1897c11da8bcb40b501fe46d431a6de0.tar.gz vcpkg-46bd973e1897c11da8bcb40b501fe46d431a6de0.zip | |
[Tbb] Updates 2019.03.29 (#5928)
* [Tbb] Updates 2019.03.29
* Set the tbb installed libs in TBBConfig.cmake
| -rw-r--r-- | ports/tbb/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tbb/portfile.cmake | 24 |
2 files changed, 19 insertions, 7 deletions
diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index 496c8c20f..048f711e0 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,3 +1,3 @@ Source: tbb -Version: 2019_U4 +Version: 2019_U5 Description: Intel's Threading Building Blocks. diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index 67056533a..a0895442d 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -10,8 +10,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO 01org/tbb - REF 2019_U4 - SHA512 f8ba92663c822e36f68f2b1837aa66d4fc285abe8c0c9b501f6cc31d3186d39b193588e49988e488beb9d400a1c3aa3fe72580f428e7ceca3581e649f28ae59e + REF 2019_U5 + SHA512 227b12e3864fbb922ddbc99700bf94d7d8897d62e2056bf3beb608efacf3ca785dd416b94ad65b421b6c9fc11caff688147b5fbe400c51e98678cee5dc04f274 HEAD_REF tbb_2019 ) @@ -25,7 +25,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStor vcpkg_install_cmake() - # Settings for TBBConfigForSource.cmake.in + # Settings for TBBConfigInternal.cmake.in set(TBB_LIB_EXT a) set(TBB_LIB_PREFIX lib) else() @@ -43,7 +43,7 @@ else() RELEASE_CONFIGURATION ${RELEASE_CONFIGURATION} DEBUG_CONFIGURATION ${DEBUG_CONFIGURATION} ) - # Settings for TBBConfigForSource.cmake.in + # Settings for TBBConfigInternal.cmake.in set(TBB_LIB_EXT lib) set(TBB_LIB_PREFIX) endif() @@ -53,7 +53,7 @@ file(COPY ${SOURCE_PATH}/include/serial DESTINATION ${CURRENT_PACKAGES_DIR}/include) -# Settings for TBBConfigForSource.cmake.in +# Settings for TBBConfigInternal.cmake.in if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(TBB_DEFAULT_COMPONENTS tbb tbbmalloc) else() @@ -69,7 +69,7 @@ set(TBB_RELEASE_DIR "\${_tbb_root}/lib") set(TBB_DEBUG_DIR "\${_tbb_root}/debug/lib") configure_file( - ${SOURCE_PATH}/cmake/templates/TBBConfigForSource.cmake.in + ${SOURCE_PATH}/cmake/templates/TBBConfigInternal.cmake.in ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake @ONLY ) @@ -80,6 +80,18 @@ string(REPLACE _contents "${_contents}" ) +string(REPLACE + "set(_tbb_release_lib \"/\${_tbb_component}.lib\")" + "set(_tbb_release_lib \"\${_tbb_root}/lib/\${_tbb_component}.lib\")" + _contents + "${_contents}" +) +string(REPLACE + "set(_tbb_debug_lib \"/\${_tbb_component}_debug.lib\")" + "set(_tbb_debug_lib \"\${_tbb_root}/debug/lib/\${_tbb_component}_debug.lib\")" + _contents + "${_contents}" +) string(REPLACE "SHARED IMPORTED)" "UNKNOWN IMPORTED)" _contents "${_contents}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake "${_contents}") |