diff options
| -rw-r--r-- | ports/tbb/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tbb/portfile.cmake | 85 |
2 files changed, 34 insertions, 53 deletions
diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index b82b70555..9dc9198f8 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,3 +1,3 @@ Source: tbb -Version: 20160916 +Version: 2017_U6 Description: Intel's Threading Building Blocks. diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index fc761f113..a733be711 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -1,24 +1,26 @@ -# Common Ambient Variables: -# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg> -# 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} -# - if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(STATUS "Warning: Static building not supported yet. Building dynamic.") set(VCPKG_LIBRARY_LINKAGE dynamic) endif() +if (VCPKG_CRT_LINKAGE STREQUAL static OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) + message(FATAL_ERROR "Build settings not supported") +endif() + include(vcpkg_common_functions) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO 01org/tbb + REF 2017_U6 + SHA512 76b49fd085d8407b68b0f17e6eebfbcb7d2e6f9116bb5f6a00c6b4d59a55b16f9de79a2b9c9c3ece497b01810c33df21d0657893fd886db8bed639091ba97060 + HEAD_REF tbb_2017) + +if(TRIPLET_SYSTEM_ARCH STREQUAL x86) + set(BUILD_ARCH Win32) +else() + set(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH}) +endif() -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}) +vcpkg_build_msbuild(PROJECT_PATH ${SOURCE_PATH}/build/vs2012/makefile.sln PLATFORM ${BUILD_ARCH}) # Installation message(STATUS "Installing") @@ -27,54 +29,33 @@ file(COPY ${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() - message(FATAL_ERROR "Unsupported architecture") -endif() +set(DEBUG_OUTPUT_PATH ${SOURCE_PATH}/build/vs2012/${BUILD_ARCH}/Debug) +set(RELEASE_OUTPUT_PATH ${SOURCE_PATH}/build/vs2012/${BUILD_ARCH}/Release) 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 + ${RELEASE_OUTPUT_PATH}/tbb.lib + ${RELEASE_OUTPUT_PATH}/tbbmalloc.lib + ${RELEASE_OUTPUT_PATH}/tbbmalloc_proxy.lib 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 + ${DEBUG_OUTPUT_PATH}/tbb_debug.lib + ${DEBUG_OUTPUT_PATH}/tbbmalloc_debug.lib + ${DEBUG_OUTPUT_PATH}/tbbmalloc_proxy_debug.lib 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 + ${RELEASE_OUTPUT_PATH}/tbb.dll + ${RELEASE_OUTPUT_PATH}/tbbmalloc.dll + ${RELEASE_OUTPUT_PATH}/tbbmalloc_proxy.dll 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 + ${DEBUG_OUTPUT_PATH}/tbb_debug.dll + ${DEBUG_OUTPUT_PATH}/tbbmalloc_debug.dll + ${DEBUG_OUTPUT_PATH}/tbbmalloc_proxy_debug.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) +vcpkg_copy_pdbs() + message(STATUS "Installing done") # Handle copyright |