From a670993b7b9b18a51e76ad0bcd2c5e86e8d56834 Mon Sep 17 00:00:00 2001 From: ZeroCrunch Date: Tue, 18 Oct 2016 22:53:41 +0100 Subject: Support for Intel's Threading Building Blocks (2016/09/16) --- ports/tbb-20160916/CONTROL | 3 +++ ports/tbb-20160916/portfile.cmake | 41 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 ports/tbb-20160916/CONTROL create mode 100644 ports/tbb-20160916/portfile.cmake diff --git a/ports/tbb-20160916/CONTROL b/ports/tbb-20160916/CONTROL new file mode 100644 index 000000000..c0abc0a25 --- /dev/null +++ b/ports/tbb-20160916/CONTROL @@ -0,0 +1,3 @@ +Source: tbb-20160916 +Version: 2016/09/16 +Description: Intel's Threading Building Blocks. diff --git a/ports/tbb-20160916/portfile.cmake b/ports/tbb-20160916/portfile.cmake new file mode 100644 index 000000000..315010ba1 --- /dev/null +++ b/ports/tbb-20160916/portfile.cmake @@ -0,0 +1,41 @@ +# Common Ambient Variables: +# VCPKG_ROOT_DIR = +# TARGET_TRIPLET is the current triplet (x86-windows, etc) +# PORT is the current port name (zlib, etc) +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# + +include(${CMAKE_TRIPLET_FILE}) +include(vcpkg_common_functions) + +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tbb2017_20160916oss) +vcpkg_download_distfile(ARCHIVE + URLS "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/windows/tbb2017_20160916oss_win_1.zip" + FILENAME "tbb2017_20160916oss_win_1.zip" + SHA512 14bbc54aa0c4506bab6e6fdb7e9e562cbc88881cb683a8bd690e3101177e55433f25a2143e7af1ed52edacb44dc92fab354e1f2101bc13b33b3ea137def8bdd1 +) +vcpkg_extract_source_archive(${ARCHIVE}) + +# Installation +message(STATUS "Installing") +file(COPY ${SOURCE_PATH}/bin DESTINATION ${CURRENT_PACKAGES_DIR}/bin) +file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + +# Remove artefacts for other architectures +if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/bin/ia32) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/lib/ia32) +else() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/bin/intel64) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/lib/intel64) +endif() + +vcpkg_copy_pdbs() + +message(STATUS "Installing done") + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tbb-20160916) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/tbb-20160916/LICENSE ${CURRENT_PACKAGES_DIR}/share/tbb-20160916/copyright) -- cgit v1.2.3 From 30caaacb51630ebbb79b1609d11f79ca34cd1e9e Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 18 Oct 2016 17:05:14 -0700 Subject: [tbb] Rename package to 'tbb' --- ports/tbb-20160916/CONTROL | 3 --- ports/tbb-20160916/portfile.cmake | 41 --------------------------------------- ports/tbb/CONTROL | 3 +++ ports/tbb/portfile.cmake | 41 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 ports/tbb-20160916/CONTROL delete mode 100644 ports/tbb-20160916/portfile.cmake create mode 100644 ports/tbb/CONTROL create mode 100644 ports/tbb/portfile.cmake diff --git a/ports/tbb-20160916/CONTROL b/ports/tbb-20160916/CONTROL deleted file mode 100644 index c0abc0a25..000000000 --- a/ports/tbb-20160916/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: tbb-20160916 -Version: 2016/09/16 -Description: Intel's Threading Building Blocks. diff --git a/ports/tbb-20160916/portfile.cmake b/ports/tbb-20160916/portfile.cmake deleted file mode 100644 index 315010ba1..000000000 --- a/ports/tbb-20160916/portfile.cmake +++ /dev/null @@ -1,41 +0,0 @@ -# Common Ambient Variables: -# VCPKG_ROOT_DIR = -# TARGET_TRIPLET is the current triplet (x86-windows, etc) -# PORT is the current port name (zlib, etc) -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# - -include(${CMAKE_TRIPLET_FILE}) -include(vcpkg_common_functions) - -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tbb2017_20160916oss) -vcpkg_download_distfile(ARCHIVE - URLS "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/windows/tbb2017_20160916oss_win_1.zip" - FILENAME "tbb2017_20160916oss_win_1.zip" - SHA512 14bbc54aa0c4506bab6e6fdb7e9e562cbc88881cb683a8bd690e3101177e55433f25a2143e7af1ed52edacb44dc92fab354e1f2101bc13b33b3ea137def8bdd1 -) -vcpkg_extract_source_archive(${ARCHIVE}) - -# Installation -message(STATUS "Installing") -file(COPY ${SOURCE_PATH}/bin DESTINATION ${CURRENT_PACKAGES_DIR}/bin) -file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(COPY ${SOURCE_PATH}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - -# Remove artefacts for other architectures -if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/bin/ia32) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/lib/ia32) -else() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/bin/intel64) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/lib/intel64) -endif() - -vcpkg_copy_pdbs() - -message(STATUS "Installing done") - -# Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tbb-20160916) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/tbb-20160916/LICENSE ${CURRENT_PACKAGES_DIR}/share/tbb-20160916/copyright) diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL new file mode 100644 index 000000000..b82b70555 --- /dev/null +++ b/ports/tbb/CONTROL @@ -0,0 +1,3 @@ +Source: tbb +Version: 20160916 +Description: Intel's Threading Building Blocks. diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake new file mode 100644 index 000000000..315010ba1 --- /dev/null +++ b/ports/tbb/portfile.cmake @@ -0,0 +1,41 @@ +# Common Ambient Variables: +# VCPKG_ROOT_DIR = +# TARGET_TRIPLET is the current triplet (x86-windows, etc) +# PORT is the current port name (zlib, etc) +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# + +include(${CMAKE_TRIPLET_FILE}) +include(vcpkg_common_functions) + +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tbb2017_20160916oss) +vcpkg_download_distfile(ARCHIVE + URLS "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/windows/tbb2017_20160916oss_win_1.zip" + FILENAME "tbb2017_20160916oss_win_1.zip" + SHA512 14bbc54aa0c4506bab6e6fdb7e9e562cbc88881cb683a8bd690e3101177e55433f25a2143e7af1ed52edacb44dc92fab354e1f2101bc13b33b3ea137def8bdd1 +) +vcpkg_extract_source_archive(${ARCHIVE}) + +# Installation +message(STATUS "Installing") +file(COPY ${SOURCE_PATH}/bin DESTINATION ${CURRENT_PACKAGES_DIR}/bin) +file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + +# Remove artefacts for other architectures +if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/bin/ia32) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/lib/ia32) +else() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/bin/intel64) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/lib/intel64) +endif() + +vcpkg_copy_pdbs() + +message(STATUS "Installing done") + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tbb-20160916) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/tbb-20160916/LICENSE ${CURRENT_PACKAGES_DIR}/share/tbb-20160916/copyright) -- cgit v1.2.3 From cb9a50cd8767191daf08dbc4ddb26277378bd4e8 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 18 Oct 2016 17:14:54 -0700 Subject: [tbb] Correct install paths --- ports/tbb/portfile.cmake | 64 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index 315010ba1..80b6bff3f 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -19,23 +19,61 @@ vcpkg_extract_source_archive(${ARCHIVE}) # Installation message(STATUS "Installing") -file(COPY ${SOURCE_PATH}/bin DESTINATION ${CURRENT_PACKAGES_DIR}/bin) -file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(COPY ${SOURCE_PATH}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - -# Remove artefacts for other architectures -if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/bin/ia32) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/lib/ia32) +file(COPY + ${SOURCE_PATH}/include/tbb + ${SOURCE_PATH}/include/serial + DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(BIN_PATH ${SOURCE_PATH}/bin/intel64/vc14) + set(LIB_PATH ${SOURCE_PATH}/lib/intel64/vc14) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(BIN_PATH ${SOURCE_PATH}/bin/ia32/vc14) + set(LIB_PATH ${SOURCE_PATH}/lib/ia32/vc14) else() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/bin/intel64) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/lib/intel64) + message(FATAL_ERROR "Unsupported architecture") endif() -vcpkg_copy_pdbs() +file(COPY + ${LIB_PATH}/tbb.lib + ${LIB_PATH}/tbb_preview.lib + ${LIB_PATH}/tbbmalloc.lib + ${LIB_PATH}/tbbmalloc_proxy.lib + ${LIB_PATH}/tbbproxy.lib + ${LIB_PATH}/tbbproxy.pdb + DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +file(COPY + ${LIB_PATH}/tbb_debug.lib + ${LIB_PATH}/tbb_preview_debug.lib + ${LIB_PATH}/tbbmalloc_debug.lib + ${LIB_PATH}/tbbmalloc_proxy_debug.lib + ${LIB_PATH}/tbbproxy_debug.lib + ${LIB_PATH}/tbbproxy_debug.pdb + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + +file(COPY + ${BIN_PATH}/tbb.dll + ${BIN_PATH}/tbb_preview.dll + ${BIN_PATH}/tbbmalloc.dll + ${BIN_PATH}/tbbmalloc_proxy.dll + ${BIN_PATH}/tbb.pdb + ${BIN_PATH}/tbb_preview.pdb + ${BIN_PATH}/tbbmalloc.pdb + ${BIN_PATH}/tbbmalloc_proxy.pdb + DESTINATION ${CURRENT_PACKAGES_DIR}/bin) +file(COPY + ${BIN_PATH}/tbb_debug.dll + ${BIN_PATH}/tbb_preview_debug.dll + ${BIN_PATH}/tbbmalloc_debug.dll + ${BIN_PATH}/tbbmalloc_proxy_debug.dll + ${BIN_PATH}/tbb_debug.pdb + ${BIN_PATH}/tbb_preview_debug.pdb + ${BIN_PATH}/tbbmalloc_debug.pdb + ${BIN_PATH}/tbbmalloc_proxy_debug.pdb + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) message(STATUS "Installing done") # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tbb-20160916) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/tbb-20160916/LICENSE ${CURRENT_PACKAGES_DIR}/share/tbb-20160916/copyright) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tbb) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/tbb/LICENSE ${CURRENT_PACKAGES_DIR}/share/tbb/copyright) -- cgit v1.2.3