The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Tbb] Updates 2019.03.29 (#5928)

Browse Source 
* [Tbb] Updates 2019.03.29

* Set the tbb  installed libs in TBBConfig.cmake
This commit is contained in:
Phoebe 2019-04-08 23:23:31 -07:00 committed by Phil Christensen
parent 81ecf512ac
commit 46bd973e18
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/tbb/CONTROL
View File

@ -1,3 +1,3 @@
Source: tbb
Version: 2019_U4
Version: 2019_U5
Description: Intel's Threading Building Blocks.

24
ports/tbb/portfile.cmake
View File

@ -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}")