diff options
| author | mfornace <mfornace@users.noreply.github.com> | 2020-09-11 12:12:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-11 12:12:04 -0700 |
| commit | 946fa300e7529c9739e9edbd19f82e8a8975d5bf (patch) | |
| tree | dac8f432a00729448b4bd074c5bd7e314f9e6e6f /ports/cpp-taskflow/fix-compiler-error.patch | |
| parent | 59115f6e3a8efe55f24ec224fd61abdfb8bfc604 (diff) | |
| download | vcpkg-946fa300e7529c9739e9edbd19f82e8a8975d5bf.tar.gz vcpkg-946fa300e7529c9739e9edbd19f82e8a8975d5bf.zip | |
[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>
Diffstat (limited to 'ports/cpp-taskflow/fix-compiler-error.patch')
| -rw-r--r-- | ports/cpp-taskflow/fix-compiler-error.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/ports/cpp-taskflow/fix-compiler-error.patch b/ports/cpp-taskflow/fix-compiler-error.patch deleted file mode 100644 index 1bcdcd41f..000000000 --- a/ports/cpp-taskflow/fix-compiler-error.patch +++ /dev/null @@ -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) - # ----------------------------------------------------------------------------- |