* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/cpp-taskflow/files/, dev-cpp/cpp-taskflow/
@ 2021-01-24 13:49 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2021-01-24 13:49 UTC (permalink / raw
To: gentoo-commits
commit: bced17bcbe33a9bf231bff24a88815647b04e1dc
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sun Jan 24 13:48:12 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 13:48:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bced17bc
dev-cpp/cpp-taskflow: Bump to 3.0.0
Closes: https://bugs.gentoo.org/740556
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-cpp/cpp-taskflow/Manifest | 1 +
dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild | 32 +++++++++
.../files/cpp-taskflow-3.0.0-gnuinstalldir.patch | 79 ++++++++++++++++++++++
3 files changed, 112 insertions(+)
diff --git a/dev-cpp/cpp-taskflow/Manifest b/dev-cpp/cpp-taskflow/Manifest
index 3af8545a82b..dc4673ee858 100644
--- a/dev-cpp/cpp-taskflow/Manifest
+++ b/dev-cpp/cpp-taskflow/Manifest
@@ -1,2 +1,3 @@
DIST cpp-taskflow-2.4.0.tar.gz 76993334 BLAKE2B 8f257165ab72dbe6c1cf6a86886669008e9f16f1dfd4871defc452bdb9dfa3e45ab9bfbbdc874b4ba566a2a7d8984a666ce2933b2c6d2215467f7fbfa03ac520 SHA512 dd6c7500e39d7058871280d12e120bd28d9609e5289f1d7851b3b59e2c1bfe74d3040d902bd5b26895e558b563c8abad878e7bc343e199e7356940c02a64217f
DIST cpp-taskflow-2.6.0.tar.gz 68626469 BLAKE2B d85b1615be47c1e98e613e7875424892613205a0cc3f380f7d6fd0521045c5750441e9267382ec5282299e4074a7b85f442e53f38a2f12aff7d3d925a94b8773 SHA512 43b023c7d744ae1e0baf6f504f32da481e950ec5cc34fe5511e4bbb8905203e4726917ee103b1c02544a75c6216c2ca481034be810b61a35511a3d7a2b278133
+DIST cpp-taskflow-3.0.0.tar.gz 79242171 BLAKE2B 18a89fbc2dc8d37ed03a3b1002b7803c37cfa9b6f3bd6a29e53756165971ec557e2ba60b72417f400f0b1c5fe12a0d8b88ada109abc539838b7d5eb1c10f6237 SHA512 5c838ff4436ade1f3755eb6859f724188be2bfcd11baf172413a0bdc18bc516b7b911e6d83a140c95548f844a8c8b908992bdec10b3b6569876a3e3b2d5b821e
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild
new file mode 100644
index 00000000000..ee708046e37
--- /dev/null
+++ b/dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Modern C++ Parallel Task Programming"
+HOMEPAGE="https://cpp-taskflow.github.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/${P}-gnuinstalldir.patch )
+
+S="${WORKDIR}/taskflow-${PV}"
+HTML_DOCS=( docs/. )
+
+src_configure() {
+ # TODO: enable CUDA via USE flag
+ local mycmakeargs=(
+ -DTF_BUILD_CUDA=OFF
+ -DTF_BUILD_EXAMPLES=$(usex examples)
+ -DTF_BUILD_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-3.0.0-gnuinstalldir.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-3.0.0-gnuinstalldir.patch
new file mode 100644
index 00000000000..8e974f2f826
--- /dev/null
+++ b/dev-cpp/cpp-taskflow/files/cpp-taskflow-3.0.0-gnuinstalldir.patch
@@ -0,0 +1,79 @@
+https://github.com/taskflow/taskflow/pull/280
+Author: David Seifert <soap@gentoo.org>
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,9 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
+ # Include additional language check
+ include(CheckLanguage)
+
++# Adhere to GNU conventions
++include(GNUInstallDirs)
++
+ # Compiler vendors
+ ## g++
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+@@ -244,6 +247,8 @@ message(STATUS "CMAKE_CURRENT_BINARY_DIR: " ${CMAKE_CURRENT_BINARY_DIR})
+ message(STATUS "CMAKE_CURRENT_LIST_DIR: " ${CMAKE_CURRENT_LIST_DIR})
+ message(STATUS "CMAKE_EXE_LINKER_FLAGS: " ${CMAKE_EXE_LINKER_FLAGS})
+ message(STATUS "CMAKE_INSTALL_PREFIX: " ${CMAKE_INSTALL_PREFIX})
++message(STATUS "CMAKE_INSTALL_FULL_INCLUDEDIR: " ${CMAKE_INSTALL_FULL_INCLUDEDIR})
++message(STATUS "CMAKE_INSTALL_FULL_LIBDIR: " ${CMAKE_INSTALL_FULL_LIBDIR})
+ message(STATUS "CMAKE_MODULE_PATH: " ${CMAKE_MODULE_PATH})
+ message(STATUS "CMAKE_PREFIX_PATH: " ${CMAKE_PREFIX_PATH})
+ message(STATUS "TF_BUILD_BENCHMARKS: " ${TF_BUILD_BENCHMARKS})
+@@ -252,8 +257,6 @@ message(STATUS "TF_BUILD_SYCL: " ${TF_BUILD_SYCL})
+ message(STATUS "TF_BUILD_TESTS: " ${TF_BUILD_TESTS})
+ message(STATUS "TF_BUILD_EXAMPLES: " ${TF_BUILD_EXAMPLES})
+ message(STATUS "TF_BUILD_PROFILER: " ${TF_BUILD_PROFILER})
+-message(STATUS "TF_INC_INSTALL_DIR: " ${TF_INC_INSTALL_DIR})
+-message(STATUS "TF_LIB_INSTALL_DIR: " ${TF_LIB_INSTALL_DIR})
+ message(STATUS "TF_UTEST_DIR: " ${TF_UTEST_DIR})
+ message(STATUS "TF_EXAMPLE_DIR: " ${TF_EXAMPLE_DIR})
+ message(STATUS "TF_BENCHMARK_DIR: " ${TF_BENCHMARK_DIR})
+@@ -334,7 +337,7 @@ endif(TF_BUILD_BENCHMARKS)
+ # -----------------------------------------------------------------------------
+
+ # install header
+-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/taskflow DESTINATION ${TF_INC_INSTALL_DIR})
++install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/taskflow DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+ # export target
+ set_target_properties(${PROJECT_NAME} PROPERTIES EXPORT_NAME ${PROJECT_NAME})
+@@ -350,7 +353,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 ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ )
+
+ # set up config
+@@ -359,8 +362,8 @@ 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}
+- PATH_VARS TF_INC_INSTALL_DIR
++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++ PATH_VARS CMAKE_INSTALL_FULL_INCLUDEDIR
+ )
+
+ write_basic_package_version_file(
+@@ -371,6 +374,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 ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ )
+
+--- a/TaskflowConfig.cmake.in
++++ b/TaskflowConfig.cmake.in
+@@ -1,6 +1,6 @@
+ @PACKAGE_INIT@
+
+-set_and_check(@PROJECT_NAME@_INCLUDE_DIR "@PACKAGE_TF_INC_INSTALL_DIR@")
++set_and_check(@PROJECT_NAME@_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
+
+ include(CMakeFindDependencyMacro)
+ find_dependency(Threads)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/cpp-taskflow/files/, dev-cpp/cpp-taskflow/
@ 2022-05-18 3:25 Matthias Maier
0 siblings, 0 replies; 3+ messages in thread
From: Matthias Maier @ 2022-05-18 3:25 UTC (permalink / raw
To: gentoo-commits
commit: aabe03547d71833b573682f4996d7d384c28c90a
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 03:07:48 2022 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed May 18 03:25:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabe0354
dev-cpp/cpp-taskflow: update live ebuild
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild | 7 +-
.../files/cpp-taskflow-9999-fix_doctest.patch | 377 +++++++++++++++++++++
2 files changed, 382 insertions(+), 2 deletions(-)
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild
index 9b146d9dc546..a00e95ad6e52 100644
--- a/dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild
+++ b/dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -26,9 +26,12 @@ DEPEND="test? ( dev-cpp/doctest )"
HTML_DOCS=( docs/. )
+PATCHES=(
+ "${FILESDIR}"/cpp-taskflow-9999-fix_doctest.patch
+)
+
src_prepare() {
rm -r "${S}/3rd-party" || die "rm failed"
- default
cmake_src_prepare
}
diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-9999-fix_doctest.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-9999-fix_doctest.patch
new file mode 100644
index 000000000000..323d17e7f535
--- /dev/null
+++ b/dev-cpp/cpp-taskflow/files/cpp-taskflow-9999-fix_doctest.patch
@@ -0,0 +1,377 @@
+diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
+index 3397d798..1256e8e6 100644
+--- a/unittests/CMakeLists.txt
++++ b/unittests/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ enable_testing()
+
+-include(${TF_3RD_PARTY_DIR}/doctest/doctest.cmake)
++find_package(doctest REQUIRED)
++include(doctest)
+
+ list(APPEND TF_UNITTESTS
+ utility
+@@ -23,8 +24,7 @@ list(APPEND TF_UNITTESTS
+
+ foreach(unittest IN LISTS TF_UNITTESTS)
+ add_executable(${unittest} ${unittest}.cpp)
+- target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings)
+- target_include_directories(${unittest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest)
++ target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings doctest::doctest)
+ doctest_discover_tests(${unittest})
+ endforeach()
+
+diff --git a/unittests/algorithms.cpp b/unittests/algorithms.cpp
+index a250713a..09ae9ba5 100644
+--- a/unittests/algorithms.cpp
++++ b/unittests/algorithms.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/reduce.hpp>
+ #include <taskflow/algorithm/sort.hpp>
+diff --git a/unittests/asyncs.cpp b/unittests/asyncs.cpp
+index 28eeaa8c..466687a2 100644
+--- a/unittests/asyncs.cpp
++++ b/unittests/asyncs.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // --------------------------------------------------------
+diff --git a/unittests/basics.cpp b/unittests/basics.cpp
+index f5b9e3dd..e93c3fd3 100644
+--- a/unittests/basics.cpp
++++ b/unittests/basics.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/reduce.hpp>
+
+diff --git a/unittests/cancellation.cpp b/unittests/cancellation.cpp
+index 3ce1cb8c..6543ee52 100644
+--- a/unittests/cancellation.cpp
++++ b/unittests/cancellation.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // EmptyFuture
+diff --git a/unittests/compositions.cpp b/unittests/compositions.cpp
+index 4fd621b5..e3c91e4c 100644
+--- a/unittests/compositions.cpp
++++ b/unittests/compositions.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // --------------------------------------------------------
+diff --git a/unittests/control_flow.cpp b/unittests/control_flow.cpp
+index 024ace84..11206384 100644
+--- a/unittests/control_flow.cpp
++++ b/unittests/control_flow.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // --------------------------------------------------------
+diff --git a/unittests/cuda/CMakeLists.txt b/unittests/cuda/CMakeLists.txt
+index d0ccc8e9..ccb46721 100644
+--- a/unittests/cuda/CMakeLists.txt
++++ b/unittests/cuda/CMakeLists.txt
+@@ -13,15 +13,14 @@ list(APPEND TF_CUDA_UNITTESTS
+
+ foreach(cudatest IN LISTS TF_CUDA_UNITTESTS)
+ add_executable(${cudatest} ${cudatest}.cu)
+- target_link_libraries(${cudatest} ${PROJECT_NAME} tf::default_settings)
+- target_include_directories(${cudatest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest)
+-
++ target_link_libraries(${cudatest} ${PROJECT_NAME} tf::default_settings doctest::doctest)
++
+ # avoid cmake 3.18+ warning
+ # we let nvcc to decide the flag if the architecture is not given
+ if(NOT CUDA_ARCHITECTURES)
+ set_property(TARGET ${cudatest} PROPERTY CUDA_ARCHITECTURES OFF)
+ endif()
+-
++
+ doctest_discover_tests(${cudatest})
+ endforeach()
+
+diff --git a/unittests/cuda/cuda_algorithms.cu b/unittests/cuda/cuda_algorithms.cu
+index cccc04b4..47645273 100644
+--- a/unittests/cuda/cuda_algorithms.cu
++++ b/unittests/cuda/cuda_algorithms.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+ #include <taskflow/cuda/algorithm/for_each.hpp>
+diff --git a/unittests/cuda/cuda_basics.cu b/unittests/cuda/cuda_basics.cu
+index 8e0fdffd..f97c7822 100644
+--- a/unittests/cuda/cuda_basics.cu
++++ b/unittests/cuda/cuda_basics.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+
+diff --git a/unittests/cuda/cuda_capturer_optimizer.cu b/unittests/cuda/cuda_capturer_optimizer.cu
+index 86fcfb72..7cbcf0a5 100644
+--- a/unittests/cuda/cuda_capturer_optimizer.cu
++++ b/unittests/cuda/cuda_capturer_optimizer.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+ #include <taskflow/cuda/algorithm/for_each.hpp>
+diff --git a/unittests/cuda/cuda_device.cu b/unittests/cuda/cuda_device.cu
+index 49df36aa..fb68b29a 100644
+--- a/unittests/cuda/cuda_device.cu
++++ b/unittests/cuda/cuda_device.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+
+diff --git a/unittests/cuda/cuda_kmeans.cu b/unittests/cuda/cuda_kmeans.cu
+index 91495b59..c14d250f 100644
+--- a/unittests/cuda/cuda_kmeans.cu
++++ b/unittests/cuda/cuda_kmeans.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+ #include <taskflow/cuda/algorithm/for_each.hpp>
+diff --git a/unittests/cuda/cuda_matrix.cu b/unittests/cuda/cuda_matrix.cu
+index 8e9f2421..ec5386f4 100644
+--- a/unittests/cuda/cuda_matrix.cu
++++ b/unittests/cuda/cuda_matrix.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+
+diff --git a/unittests/cuda/cuda_rebinds.cu b/unittests/cuda/cuda_rebinds.cu
+index eb9218fa..92798dfd 100644
+--- a/unittests/cuda/cuda_rebinds.cu
++++ b/unittests/cuda/cuda_rebinds.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+diff --git a/unittests/cuda/cuda_updates.cu b/unittests/cuda/cuda_updates.cu
+index bdda539a..d8b52dcf 100644
+--- a/unittests/cuda/cuda_updates.cu
++++ b/unittests/cuda/cuda_updates.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+diff --git a/unittests/movable.cpp b/unittests/movable.cpp
+index 96ce9da3..d5e64b47 100644
+--- a/unittests/movable.cpp
++++ b/unittests/movable.cpp
+@@ -1,5 +1,5 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // increments a counter only on destruction
+diff --git a/unittests/pipelines.cpp b/unittests/pipelines.cpp
+index 94d8f394..701365c0 100644
+--- a/unittests/pipelines.cpp
++++ b/unittests/pipelines.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/pipeline.hpp>
+diff --git a/unittests/semaphores.cpp b/unittests/semaphores.cpp
+index 616191b5..64b8a587 100644
+--- a/unittests/semaphores.cpp
++++ b/unittests/semaphores.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // --------------------------------------------------------
+diff --git a/unittests/serializer.cpp b/unittests/serializer.cpp
+index 92c3ec70..c6a715e6 100644
+--- a/unittests/serializer.cpp
++++ b/unittests/serializer.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/utility/serializer.hpp>
+ #include <random>
+
+diff --git a/unittests/sorting.cpp b/unittests/sorting.cpp
+index 8146324a..ff732fb0 100644
+--- a/unittests/sorting.cpp
++++ b/unittests/sorting.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/sort.hpp>
+
+diff --git a/unittests/subflows.cpp b/unittests/subflows.cpp
+index 9db430de..e669a2c8 100644
+--- a/unittests/subflows.cpp
++++ b/unittests/subflows.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/reduce.hpp>
+
+diff --git a/unittests/sycl/CMakeLists.txt b/unittests/sycl/CMakeLists.txt
+index c6481996..3b014d0e 100644
+--- a/unittests/sycl/CMakeLists.txt
++++ b/unittests/sycl/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-list(APPEND TF_SYCL_TESTS
++list(APPEND TF_SYCL_TESTS
+ sycl_basics
+ #sycl_algorithms
+ #sycl_rebinds
+@@ -12,9 +12,8 @@ foreach(sycl_test IN LISTS TF_SYCL_TESTS)
+ target_compile_options(${sycl_test} PRIVATE ${TF_SYCL_OPTIONS})
+ target_link_options(${sycl_test} PRIVATE ${TF_SYCL_OPTIONS})
+ target_link_libraries(${sycl_test}
+- ${PROJECT_NAME} Threads::Threads tf::default_settings
++ ${PROJECT_NAME} Threads::Threads tf::default_settings doctest::doctest
+ )
+- target_include_directories(${sycl_test} PRIVATE ${TF_3RD_PARTY_DIR}/doctest)
+-
++
+ doctest_discover_tests(${sycl_test})
+ endforeach()
+diff --git a/unittests/sycl/sycl_algorithms.cpp b/unittests/sycl/sycl_algorithms.cpp
+index e029b2ef..7b44ca78 100644
+--- a/unittests/sycl/sycl_algorithms.cpp
++++ b/unittests/sycl/sycl_algorithms.cpp
+@@ -1,5 +1,5 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/syclflow.hpp>
+
+ constexpr float eps = 0.0001f;
+diff --git a/unittests/sycl/sycl_basics.cpp b/unittests/sycl/sycl_basics.cpp
+index 0ff76969..eac52906 100644
+--- a/unittests/sycl/sycl_basics.cpp
++++ b/unittests/sycl/sycl_basics.cpp
+@@ -1,5 +1,5 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/sycl/syclflow.hpp>
+
+ // task creation
+diff --git a/unittests/sycl/sycl_rebinds.cpp b/unittests/sycl/sycl_rebinds.cpp
+index 71b2f9de..1b5949fd 100644
+--- a/unittests/sycl/sycl_rebinds.cpp
++++ b/unittests/sycl/sycl_rebinds.cpp
+@@ -1,5 +1,5 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/syclflow.hpp>
+
+ // ----------------------------------------------------------------------------
+diff --git a/unittests/traversals.cpp b/unittests/traversals.cpp
+index 71aef04b..683915b4 100644
+--- a/unittests/traversals.cpp
++++ b/unittests/traversals.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/taskflow.hpp>
+
+diff --git a/unittests/tsq.cpp b/unittests/tsq.cpp
+index 51a137a7..8e9cac56 100644
+--- a/unittests/tsq.cpp
++++ b/unittests/tsq.cpp
+@@ -49,7 +49,7 @@
+
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // ============================================================================
+diff --git a/unittests/utility.cpp b/unittests/utility.cpp
+index 63c49708..01ee81a3 100644
+--- a/unittests/utility.cpp
++++ b/unittests/utility.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/utility/traits.hpp>
+ #include <taskflow/utility/object_pool.hpp>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/cpp-taskflow/files/, dev-cpp/cpp-taskflow/
@ 2022-05-18 3:25 Matthias Maier
0 siblings, 0 replies; 3+ messages in thread
From: Matthias Maier @ 2022-05-18 3:25 UTC (permalink / raw
To: gentoo-commits
commit: ebd5cbef870caf4412a7209ab8f82aebbbb26a07
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 03:05:20 2022 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed May 18 03:25:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd5cbef
dev-cpp/cpp-taskflow: add 3.3.0
* fix doctest dependency
Closes: https://bugs.gentoo.org/827046
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
dev-cpp/cpp-taskflow/Manifest | 1 +
dev-cpp/cpp-taskflow/cpp-taskflow-3.3.0.ebuild | 47 +++
.../files/cpp-taskflow-3.3.0-fix_doctest.patch | 377 +++++++++++++++++++++
3 files changed, 425 insertions(+)
diff --git a/dev-cpp/cpp-taskflow/Manifest b/dev-cpp/cpp-taskflow/Manifest
index 3a4c979f17cf..61c03f9dcff0 100644
--- a/dev-cpp/cpp-taskflow/Manifest
+++ b/dev-cpp/cpp-taskflow/Manifest
@@ -1 +1,2 @@
DIST cpp-taskflow-3.2.0.tar.gz 79152157 BLAKE2B 03b4b1cf772c9dec4557a706c7872de95312d4e72ec7dcef1accfd1d5eaf470e60440d75ea0c993ab494ef460dc44639719ea1732fa92c54d64dde31b90b9224 SHA512 e30d95b69f64524c9b06cf7442236998f91b1083818f06439888d78d5a1b988bc952c02fd0ec88114283cbe6c31a7bbfe810a7114998f4b5f60c4cff921bb0fa
+DIST cpp-taskflow-3.3.0.tar.gz 64446007 BLAKE2B 07878a03bd90af64914f1dc80850bcf5d4140f20ecfa998237039b6f37cc668e8c2b5dffafb75f4518209b3ac01f9935f5e30a020871334f131e6fe7654748bf SHA512 08ab20bf38927d49c8332fc103cb7b4b6358efa06466cb8471f2004eb27b79b9eadc9971ec4acd110c8f369686b6f99bf3e21192285c3f28b9cb855bfd9ab0b5
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-3.3.0.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-3.3.0.ebuild
new file mode 100644
index 000000000000..649d2fa20cc2
--- /dev/null
+++ b/dev-cpp/cpp-taskflow/cpp-taskflow-3.3.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Modern C++ Parallel Task Programming"
+HOMEPAGE="https://cpp-taskflow.github.io"
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/cpp-taskflow/${PN}.git"
+ inherit git-r3
+ S="${WORKDIR}/cpp-taskflow-${PV}"
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/taskflow-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/doctest )"
+
+HTML_DOCS=( docs/. )
+
+PATCHES=(
+ "${FILESDIR}"/cpp-taskflow-3.3.0-fix_doctest.patch
+)
+
+src_prepare() {
+ rm -r "${S}/3rd-party" || die "rm failed"
+ cmake_src_prepare
+}
+
+src_configure() {
+ # TODO: enable CUDA via USE flag
+ local mycmakeargs=(
+ -DTF_BUILD_CUDA=OFF
+ -DTF_BUILD_EXAMPLES=$(usex examples)
+ -DTF_BUILD_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-3.3.0-fix_doctest.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-3.3.0-fix_doctest.patch
new file mode 100644
index 000000000000..c5da4fd96eb6
--- /dev/null
+++ b/dev-cpp/cpp-taskflow/files/cpp-taskflow-3.3.0-fix_doctest.patch
@@ -0,0 +1,377 @@
+diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
+index cf881d4..ff6618a 100644
+--- a/unittests/CMakeLists.txt
++++ b/unittests/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ enable_testing()
+
+-include(${TF_3RD_PARTY_DIR}/doctest/doctest.cmake)
++find_package(doctest REQUIRED)
++include(doctest)
+
+ list(APPEND TF_UNITTESTS
+ utility
+@@ -22,8 +23,7 @@ list(APPEND TF_UNITTESTS
+
+ foreach(unittest IN LISTS TF_UNITTESTS)
+ add_executable(${unittest} ${unittest}.cpp)
+- target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings)
+- target_include_directories(${unittest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest)
++ target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings doctest::doctest)
+ doctest_discover_tests(${unittest})
+ endforeach()
+
+diff --git a/unittests/algorithms.cpp b/unittests/algorithms.cpp
+index 5ae7ac6..efffdd9 100644
+--- a/unittests/algorithms.cpp
++++ b/unittests/algorithms.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/reduce.hpp>
+ #include <taskflow/algorithm/sort.hpp>
+diff --git a/unittests/asyncs.cpp b/unittests/asyncs.cpp
+index cd6985c..4e7b80f 100644
+--- a/unittests/asyncs.cpp
++++ b/unittests/asyncs.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // --------------------------------------------------------
+diff --git a/unittests/basics.cpp b/unittests/basics.cpp
+index 2784fa4..ac1ab20 100644
+--- a/unittests/basics.cpp
++++ b/unittests/basics.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/reduce.hpp>
+
+diff --git a/unittests/cancellation.cpp b/unittests/cancellation.cpp
+index 3273af3..ff17ad4 100644
+--- a/unittests/cancellation.cpp
++++ b/unittests/cancellation.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // EmptyFuture
+diff --git a/unittests/compositions.cpp b/unittests/compositions.cpp
+index 0d330ae..e2784a5 100644
+--- a/unittests/compositions.cpp
++++ b/unittests/compositions.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // --------------------------------------------------------
+diff --git a/unittests/control_flow.cpp b/unittests/control_flow.cpp
+index 086a8a9..f2da83e 100644
+--- a/unittests/control_flow.cpp
++++ b/unittests/control_flow.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // --------------------------------------------------------
+diff --git a/unittests/cuda/CMakeLists.txt b/unittests/cuda/CMakeLists.txt
+index 7c76523..be2757c 100644
+--- a/unittests/cuda/CMakeLists.txt
++++ b/unittests/cuda/CMakeLists.txt
+@@ -12,15 +12,14 @@ list(APPEND TF_CUDA_UNITTESTS
+
+ foreach(cudatest IN LISTS TF_CUDA_UNITTESTS)
+ add_executable(${cudatest} ${cudatest}.cu)
+- target_link_libraries(${cudatest} ${PROJECT_NAME} tf::default_settings)
+- target_include_directories(${cudatest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest)
+-
++ target_link_libraries(${cudatest} ${PROJECT_NAME} tf::default_settings doctest::doctest)
++
+ # avoid cmake 3.18+ warning
+ # we let nvcc to decide the flag if the architecture is not given
+ if(NOT CUDA_ARCHITECTURES)
+ set_property(TARGET ${cudatest} PROPERTY CUDA_ARCHITECTURES OFF)
+ endif()
+-
++
+ doctest_discover_tests(${cudatest})
+ endforeach()
+
+diff --git a/unittests/cuda/cuda_algorithms.cu b/unittests/cuda/cuda_algorithms.cu
+index d97289e..5185cd9 100644
+--- a/unittests/cuda/cuda_algorithms.cu
++++ b/unittests/cuda/cuda_algorithms.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+ #include <taskflow/cuda/algorithm/for_each.hpp>
+diff --git a/unittests/cuda/cuda_basics.cu b/unittests/cuda/cuda_basics.cu
+index 8e0fdff..f97c782 100644
+--- a/unittests/cuda/cuda_basics.cu
++++ b/unittests/cuda/cuda_basics.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+
+diff --git a/unittests/cuda/cuda_capturer_optimizer.cu b/unittests/cuda/cuda_capturer_optimizer.cu
+index 86fcfb7..7cbcf0a 100644
+--- a/unittests/cuda/cuda_capturer_optimizer.cu
++++ b/unittests/cuda/cuda_capturer_optimizer.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+ #include <taskflow/cuda/algorithm/for_each.hpp>
+diff --git a/unittests/cuda/cuda_device.cu b/unittests/cuda/cuda_device.cu
+index b3d316d..241cc93 100644
+--- a/unittests/cuda/cuda_device.cu
++++ b/unittests/cuda/cuda_device.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+
+diff --git a/unittests/cuda/cuda_kmeans.cu b/unittests/cuda/cuda_kmeans.cu
+index 91495b5..c14d250 100644
+--- a/unittests/cuda/cuda_kmeans.cu
++++ b/unittests/cuda/cuda_kmeans.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+ #include <taskflow/cuda/algorithm/for_each.hpp>
+diff --git a/unittests/cuda/cuda_matrix.cu b/unittests/cuda/cuda_matrix.cu
+index 8e9f242..ec5386f 100644
+--- a/unittests/cuda/cuda_matrix.cu
++++ b/unittests/cuda/cuda_matrix.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+
+diff --git a/unittests/cuda/cuda_rebinds.cu b/unittests/cuda/cuda_rebinds.cu
+index eb9218f..92798df 100644
+--- a/unittests/cuda/cuda_rebinds.cu
++++ b/unittests/cuda/cuda_rebinds.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+diff --git a/unittests/cuda/cuda_updates.cu b/unittests/cuda/cuda_updates.cu
+index bdda539..d8b52dc 100644
+--- a/unittests/cuda/cuda_updates.cu
++++ b/unittests/cuda/cuda_updates.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+diff --git a/unittests/movable.cpp b/unittests/movable.cpp
+index 58be4fc..c4b3f1a 100644
+--- a/unittests/movable.cpp
++++ b/unittests/movable.cpp
+@@ -1,5 +1,5 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // increments a counter only on destruction
+diff --git a/unittests/pipelines.cpp b/unittests/pipelines.cpp
+index 6527b34..c925e67 100644
+--- a/unittests/pipelines.cpp
++++ b/unittests/pipelines.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/pipeline.hpp>
+diff --git a/unittests/semaphores.cpp b/unittests/semaphores.cpp
+index d4713f8..c537702 100644
+--- a/unittests/semaphores.cpp
++++ b/unittests/semaphores.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // --------------------------------------------------------
+diff --git a/unittests/serializer.cpp b/unittests/serializer.cpp
+index 20edef3..5b9870f 100644
+--- a/unittests/serializer.cpp
++++ b/unittests/serializer.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/utility/serializer.hpp>
+ #include <random>
+
+diff --git a/unittests/sorting.cpp b/unittests/sorting.cpp
+index 00a616c..005eaf2 100644
+--- a/unittests/sorting.cpp
++++ b/unittests/sorting.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/sort.hpp>
+
+diff --git a/unittests/subflows.cpp b/unittests/subflows.cpp
+index b1de5d1..11fd97a 100644
+--- a/unittests/subflows.cpp
++++ b/unittests/subflows.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/reduce.hpp>
+
+diff --git a/unittests/sycl/CMakeLists.txt b/unittests/sycl/CMakeLists.txt
+index 492c941..3ef1dd7 100644
+--- a/unittests/sycl/CMakeLists.txt
++++ b/unittests/sycl/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-list(APPEND TF_SYCL_TESTS
++list(APPEND TF_SYCL_TESTS
+ sycl_basics
+ sycl_algorithms
+ sycl_rebinds
+@@ -12,9 +12,8 @@ foreach(sycl_test IN LISTS TF_SYCL_TESTS)
+ target_compile_options(${sycl_test} PRIVATE ${TF_SYCL_OPTIONS})
+ target_link_options(${sycl_test} PRIVATE ${TF_SYCL_OPTIONS})
+ target_link_libraries(${sycl_test}
+- ${PROJECT_NAME} Threads::Threads tf::default_settings
++ ${PROJECT_NAME} Threads::Threads tf::default_settings doctest::doctest
+ )
+- target_include_directories(${sycl_test} PRIVATE ${TF_3RD_PARTY_DIR}/doctest)
+-
++
+ doctest_discover_tests(${sycl_test})
+ endforeach()
+diff --git a/unittests/sycl/sycl_algorithms.cpp b/unittests/sycl/sycl_algorithms.cpp
+index cde9666..93973dc 100644
+--- a/unittests/sycl/sycl_algorithms.cpp
++++ b/unittests/sycl/sycl_algorithms.cpp
+@@ -1,5 +1,5 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/syclflow.hpp>
+
+ constexpr float eps = 0.0001f;
+diff --git a/unittests/sycl/sycl_basics.cpp b/unittests/sycl/sycl_basics.cpp
+index 7ed5e16..274b9ce 100644
+--- a/unittests/sycl/sycl_basics.cpp
++++ b/unittests/sycl/sycl_basics.cpp
+@@ -1,5 +1,5 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/syclflow.hpp>
+
+ // task creation
+diff --git a/unittests/sycl/sycl_rebinds.cpp b/unittests/sycl/sycl_rebinds.cpp
+index 5a00bf8..8854ef9 100644
+--- a/unittests/sycl/sycl_rebinds.cpp
++++ b/unittests/sycl/sycl_rebinds.cpp
+@@ -1,5 +1,5 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/syclflow.hpp>
+
+ // ----------------------------------------------------------------------------
+diff --git a/unittests/traversals.cpp b/unittests/traversals.cpp
+index b7cac8a..474df49 100644
+--- a/unittests/traversals.cpp
++++ b/unittests/traversals.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/taskflow.hpp>
+
+diff --git a/unittests/tsq.cpp b/unittests/tsq.cpp
+index 097f96d..d3c5f99 100644
+--- a/unittests/tsq.cpp
++++ b/unittests/tsq.cpp
+@@ -49,7 +49,7 @@
+
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // ============================================================================
+diff --git a/unittests/utility.cpp b/unittests/utility.cpp
+index 9822cfe..95a253d 100644
+--- a/unittests/utility.cpp
++++ b/unittests/utility.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/utility/traits.hpp>
+ #include <taskflow/utility/object_pool.hpp>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-18 3:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-18 3:25 [gentoo-commits] repo/gentoo:master commit in: dev-cpp/cpp-taskflow/files/, dev-cpp/cpp-taskflow/ Matthias Maier
-- strict thread matches above, loose matches on Subject: below --
2022-05-18 3:25 Matthias Maier
2021-01-24 13:49 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox