Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[cpp-taskflow] Update to 2.5.0 (#12923) 

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
This commit is contained in:
mfornace 2020-08-24 14:33:32 -07:00 committed by GitHub
parent bf594d63fc
commit 08423be155
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/cpp-taskflow/CONTROL
View File

@ -1,4 +1,4 @@
Source: cpp-taskflow
Version: 2.2.0-1
Version: 2.5.0
Description: Fast Parallel Tasking Programming Library using Modern C++.
Homepage: https://github.com/taskflow/taskflow

31
ports/cpp-taskflow/fix-compiler-error.patch Normal file
View File

@ -0,0 +1,31 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9beec931..6782f1d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,7 +89,7 @@ target_compile_options(
$<$<CXX_COMPILER_ID:AppleClang>:-Wall -Wextra -Wfatal-errors>
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:Clang>>:-Wall -Wextra -Wfatal-errors>
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:GNU>>:-Wall -Wextra -Wfatal-errors>
- $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/W3 /permissive->
+ $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/bigobj /W3 /permissive->
#$<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=-Wall,-Wextra,-Wfatal-errors>
#$<$<CXX_COMPILER_ID:Clang>:-Wall -Wextra -Wfatal-errors>
#$<$<CXX_COMPILER_ID:GNU>:-Wall -Wextra -Wfatal-errors>
@@ -219,6 +219,8 @@ target_include_directories(${PROJECT_NAME} INTERFACE
# Example program
# -----------------------------------------------------------------------------
+if(BUILD_TEST)
+
message(STATUS "Building examples ...")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_EXAMPLE_DIR})
@@ -617,6 +619,8 @@ add_test(cuda_kmeans.1000.16C16G ${TF_UTEST_CUDA_KMEANS} -tc=kmeans.1000.16C16G)
endif(CMAKE_CUDA_COMPILER)
+endif()
+
# -----------------------------------------------------------------------------
# Benchmarking (enabled by TF_BUILD_BENCHMARKS)
# -----------------------------------------------------------------------------

10
ports/cpp-taskflow/portfile.cmake
View File

@ -2,9 +2,10 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO taskflow/taskflow
REF v2.2.0
SHA512 1aa4e9d7324f56eb33cd4986d721035f0abf12e022da956bafc0b16cf6cb82d152334ae58edc4581ab2f6d44989ca21cdd590ad560d6f1a4f905710fe08d0091
REF v2.5.0
SHA512 49f38a14a207db085a2e3581b3698cdb3be4fa65c11194db454bd2fb65da2d744347c6a10a7a903b04cc2dd5cac65ef389d400c66d2a23521c3bbe2283357890
HEAD_REF master
PATCHES fix-compiler-error.patch
)
vcpkg_configure_cmake(
@ -12,8 +13,9 @@ vcpkg_configure_cmake(
PREFER_NINJA
OPTIONS
-DTF_BUILD_EXAMPLES=OFF
-DTF_BUILD_TESTS=OFF
-DBUILD_TESTING=OFF
-DTF_BUILD_BENCHMARKS=OFF
-DCMAKE_CUDA_COMPILER=OFF
)
vcpkg_install_cmake()
@ -23,4 +25,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
# Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)