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

* Update to 2.5.0 * Disable unit test building; 2.5.0 uses BUILD_TESTING flag * Attempt to add /bigobj since I'm not sure how to disable building examples target * Fix build error when building x64 targets * Add more to the patch, remove sections with add_executable from CMakeLists.txt * Guard with BUILD_TEST, put compile option in * Disable CUDA * Change name of package to taskflow * Add patch so it's back to Cpp-Taskflow::Cpp-Taskflow... * Update CONTROL * Move - down to Port-Version. * Add taskflow 2.6.0 * Update cpp-taskflow to 2.4.0 and disable test building * Change 'cpp-taskflow' to merely depend on 'taskflow'. * Remove osx skip. * Fix up portfile and remove patch file since not needed for header-only * Case fix for Linux Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2024-11-28 03:49:06 +08:00 · 2020-09-11 12:12:04 -07:00 · 2020-09-11 12:12:04 -07:00 · 946fa300e7
commit 946fa300e7
parent 59115f6e3a
5 changed files with 37 additions and 60 deletions
--- a/ports/cpp-taskflow/CONTROL
+++ b/ports/cpp-taskflow/CONTROL
@ -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
--- a/ports/cpp-taskflow/fix-compiler-error.patch
+++ b/ports/cpp-taskflow/fix-compiler-error.patch
@ -1,31 +0,0 @@
-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)
- # -----------------------------------------------------------------------------
--- a/ports/cpp-taskflow/portfile.cmake
+++ b/ports/cpp-taskflow/portfile.cmake
@ -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)
--- a/ports/taskflow/CONTROL
+++ b/ports/taskflow/CONTROL
@ -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
--- a/ports/taskflow/portfile.cmake
+++ b/ports/taskflow/portfile.cmake
@ -0,0 +1,29 @@
+# header-only library
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO taskflow/taskflow
+    REF v2.6.0
+    SHA512 43b023c7d744ae1e0baf6f504f32da481e950ec5cc34fe5511e4bbb8905203e4726917ee103b1c02544a75c6216c2ca481034be810b61a35511a3d7a2b278133
+    HEAD_REF master
+)
+
+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/Taskflow)
+
+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)