Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[taskflow] Update cpp-taskflow 2.2.0 to taskflow 2.6.0 #13140

Merged
merged 20 commits into from
Sep 11, 2020
Merged

[taskflow] Update cpp-taskflow 2.2.0 to taskflow 2.6.0 #13140

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
dd45461
Update to 2.5.0
mfornace Aug 15, 2020
2e15b3a
Disable unit test building; 2.5.0 uses BUILD_TESTING flag
mfornace Aug 17, 2020
b78ad8b
Attempt to add /bigobj since I'm not sure how to disable building exa…
mfornace Aug 17, 2020
202fa3a
Fix build error when building x64 targets
Aug 19, 2020
8658bae
Add more to the patch, remove sections with add_executable from CMake…
mfornace Aug 19, 2020
32878bd
Guard with BUILD_TEST, put compile option in
mfornace Aug 20, 2020
f3d3a70
Disable CUDA
mfornace Aug 20, 2020
73150b9
Change name of package to taskflow
mfornace Aug 25, 2020
bb879ed
Merge branch 'master' of https://github.com/microsoft/vcpkg into upda…
mfornace Aug 25, 2020
8244acd
Add patch so it's back to Cpp-Taskflow::Cpp-Taskflow...
mfornace Aug 25, 2020
ea64978
Update CONTROL
mfornace Aug 26, 2020
48bf552
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Sep 3, 2020
6e0a31a
Move - down to Port-Version.
BillyONeal Sep 3, 2020
e2cdcf6
Add taskflow 2.6.0
mfornace Sep 4, 2020
1d39263
Update cpp-taskflow to 2.4.0 and disable test building
mfornace Sep 4, 2020
fe865cc
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Sep 7, 2020
59a300f
Change 'cpp-taskflow' to merely depend on 'taskflow'.
BillyONeal Sep 7, 2020
5ea435c
Remove osx skip.
BillyONeal Sep 7, 2020
d4aaa0c
Fix up portfile and remove patch file since not needed for header-only
mfornace Sep 11, 2020
7ca2b26
Case fix for Linux
mfornace Sep 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ports/cpp-taskflow/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Source: cpp-taskflow
Version: 2.5.0
Version: 2.6.0
Description: Fast Parallel Tasking Programming Library using Modern C++.
Homepage: https://github.com/taskflow/taskflow
Build-Depends: taskflow
31 changes: 0 additions & 31 deletions ports/cpp-taskflow/fix-compiler-error.patch
View file
Open in desktop

This file was deleted.

30 changes: 2 additions & 28 deletions ports/cpp-taskflow/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,2 @@
# header-only library
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO taskflow/taskflow
REF v2.5.0
SHA512 49f38a14a207db085a2e3581b3698cdb3be4fa65c11194db454bd2fb65da2d744347c6a10a7a903b04cc2dd5cac65ef389d400c66d2a23521c3bbe2283357890
HEAD_REF master
PATCHES fix-compiler-error.patch
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DTF_BUILD_EXAMPLES=OFF
-DBUILD_TESTING=OFF
-DTF_BUILD_BENCHMARKS=OFF
-DCMAKE_CUDA_COMPILER=OFF
)

vcpkg_install_cmake()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)

# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
message(WARNING "The port 'cpp-taskflow' has been replaced with 'taskflow'.")
SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
4 changes: 4 additions & 0 deletions ports/taskflow/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Source: taskflow
Version: 2.6.0
Description: Fast Parallel Tasking Programming Library using Modern C++.
Homepage: https://github.com/taskflow/taskflow
39 changes: 39 additions & 0 deletions ports/taskflow/fix-compiler-error.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d437ab47..f472eaa4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,7 +93,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>
@@ -1068,7 +1068,7 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets)
install(
EXPORT ${PROJECT_NAME}Targets
NAMESPACE ${PROJECT_NAME}::
- DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}
+ DESTINATION ${TF_LIB_INSTALL_DIR}/cmake
)

# set up config
@@ -1077,7 +1077,7 @@ include(CMakePackageConfigHelpers)
configure_package_config_file(
${PROJECT_NAME}Config.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
- INSTALL_DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}
+ INSTALL_DESTINATION ${TF_LIB_INSTALL_DIR}/cmake
PATH_VARS TF_INC_INSTALL_DIR
)

@@ -1089,6 +1089,6 @@ write_basic_package_version_file(
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
- DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}
+ DESTINATION ${TF_LIB_INSTALL_DIR}/cmake
)

30 changes: 30 additions & 0 deletions ports/taskflow/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# header-only library
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO taskflow/taskflow
REF v2.6.0
SHA512 43b023c7d744ae1e0baf6f504f32da481e950ec5cc34fe5511e4bbb8905203e4726917ee103b1c02544a75c6216c2ca481034be810b61a35511a3d7a2b278133
HEAD_REF master
PATCHES fix-compiler-error.patch
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DTF_BUILD_BENCHMARKS=OFF
-DTF_BUILD_CUDA=OFF
-DTF_BUILD_TESTS=OFF
-DTF_BUILD_EXAMPLES=OFF
-DBUILD_TESTING=OFF
-DCMAKE_CUDA_COMPILER=OFF
)

vcpkg_install_cmake()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)

# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
1 change: 0 additions & 1 deletion scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ cppmicroservices:arm-uwp=fail
cppmicroservices:x64-uwp=fail
cpp-netlib:arm-uwp=fail
cpp-netlib:x64-uwp=fail
cpp-taskflow:x64-osx=fail
cppcoro:x64-linux=fail
cppcoro:arm-uwp=fail
cppcoro:x64-uwp=fail
Expand Down