From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 358131382C5 for ; Tue, 30 Jun 2020 19:43:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B485E09A6; Tue, 30 Jun 2020 19:43:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 27CFFE09A6 for ; Tue, 30 Jun 2020 19:43:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B18834F2C7 for ; Tue, 30 Jun 2020 19:43:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A76AC2C5 for ; Tue, 30 Jun 2020 19:43:40 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1593497149.b6fc075df417744e70a37aa1006a9f650cd56747.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-cpp/cpp-taskflow/files/, dev-cpp/cpp-taskflow/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-cpp/cpp-taskflow/Manifest dev-cpp/cpp-taskflow/cpp-taskflow-2.3.1.ebuild dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0.ebuild dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild dev-cpp/cpp-taskflow/files/cpp-taskflow-2.3.1-fix-lib-path.patch dev-cpp/cpp-taskflow/files/cpp-taskflow-2.3.1-optional-tests-examples.patch dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix-lib-path.patch dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix-version-number.patch dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-optional-tests-examples.patch dev-cpp/cpp-taskflow/files/cpp-taskflow-9999-fix-lib-path.patch dev-cpp/cpp-taskflow/files/cpp-taskflow-9999-optional-tests-examples.patch dev-cpp/cpp-taskflow/metadata.xml X-VCS-Directories: dev-cpp/cpp-taskflow/files/ dev-cpp/cpp-taskflow/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: b6fc075df417744e70a37aa1006a9f650cd56747 X-VCS-Branch: master Date: Tue, 30 Jun 2020 19:43:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6be46b4f-6b49-4038-bf34-0ea179d27c18 X-Archives-Hash: d7f6a229f5fa9f9d3df542e6f04a4615 commit: b6fc075df417744e70a37aa1006a9f650cd56747 Author: Ronny (tastytea) Gutbrod tastytea de> AuthorDate: Tue Jun 30 06:05:49 2020 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Tue Jun 30 06:05:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b6fc075d dev-cpp/cpp-taskflow: Remove, package is in ::gentoo. Signed-off-by: Ronny (tastytea) Gutbrod tastytea.de> dev-cpp/cpp-taskflow/Manifest | 2 - dev-cpp/cpp-taskflow/cpp-taskflow-2.3.1.ebuild | 38 ----------------- dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0.ebuild | 39 ----------------- dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild | 38 ----------------- .../files/cpp-taskflow-2.3.1-fix-lib-path.patch | 49 ---------------------- ...pp-taskflow-2.3.1-optional-tests-examples.patch | 49 ---------------------- .../files/cpp-taskflow-2.4.0-fix-lib-path.patch | 49 ---------------------- .../cpp-taskflow-2.4.0-fix-version-number.patch | 13 ------ ...pp-taskflow-2.4.0-optional-tests-examples.patch | 42 ------------------- .../files/cpp-taskflow-9999-fix-lib-path.patch | 49 ---------------------- ...cpp-taskflow-9999-optional-tests-examples.patch | 42 ------------------- dev-cpp/cpp-taskflow/metadata.xml | 15 ------- 12 files changed, 425 deletions(-) diff --git a/dev-cpp/cpp-taskflow/Manifest b/dev-cpp/cpp-taskflow/Manifest deleted file mode 100644 index 408dc82..0000000 --- a/dev-cpp/cpp-taskflow/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST cpp-taskflow-2.3.1.tar.gz 98888910 BLAKE2B 3ecbc3eaf8db68ded66222c512ff7e22633fc0276eaff8ca9fd43bad13bb810ef064d0c8e762a960cdfff9197e4a810b75005a0063042c724b42599a2716e609 SHA512 94d5784198571886520d9f5d69dbce659c3cd214d986e9ac001816033d7719ae21d22ed2f5879549df15b23035d06200938a07928dd773f507317ede8a121899 -DIST cpp-taskflow-2.4.0.tar.gz 76993334 BLAKE2B 8f257165ab72dbe6c1cf6a86886669008e9f16f1dfd4871defc452bdb9dfa3e45ab9bfbbdc874b4ba566a2a7d8984a666ce2933b2c6d2215467f7fbfa03ac520 SHA512 dd6c7500e39d7058871280d12e120bd28d9609e5289f1d7851b3b59e2c1bfe74d3040d902bd5b26895e558b563c8abad878e7bc343e199e7356940c02a64217f diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-2.3.1.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-2.3.1.ebuild deleted file mode 100644 index ced7f05..0000000 --- a/dev-cpp/cpp-taskflow/cpp-taskflow-2.3.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2020 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" -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/cpp-taskflow/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://github.com/cpp-taskflow/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="test" - -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${P}-optional-tests-examples.patch - "${FILESDIR}"/${P}-fix-lib-path.patch -) - -src_configure() { - local mycmakeargs=( - -DTF_BUILD_TESTS=$(usex test ON OFF) - ) - cmake_src_configure -} diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0.ebuild deleted file mode 100644 index 8edadb7..0000000 --- a/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2020 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" -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/cpp-taskflow/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://github.com/cpp-taskflow/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="test" - -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${P}-optional-tests-examples.patch - "${FILESDIR}"/${P}-fix-lib-path.patch - "${FILESDIR}"/${P}-fix-version-number.patch -) - -src_configure() { - local mycmakeargs=( - -DTF_BUILD_TESTS=$(usex test ON OFF) - ) - cmake_src_configure -} diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild deleted file mode 100644 index ced7f05..0000000 --- a/dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2020 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" -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/cpp-taskflow/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://github.com/cpp-taskflow/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="test" - -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${P}-optional-tests-examples.patch - "${FILESDIR}"/${P}-fix-lib-path.patch -) - -src_configure() { - local mycmakeargs=( - -DTF_BUILD_TESTS=$(usex test ON OFF) - ) - cmake_src_configure -} diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.3.1-fix-lib-path.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.3.1-fix-lib-path.patch deleted file mode 100644 index 2b89307..0000000 --- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.3.1-fix-lib-path.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c267f84..3f357aa 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,6 +16,7 @@ option(TF_BUILD_BENCHMARKS "Enables build of benchmarks" OFF) - - # Include additional language check - include(CheckLanguage) -+include(GNUInstallDirs) - - # Compiler vendors - ## g++ -@@ -157,8 +158,8 @@ target_link_libraries( - #set(CMAKE_CXX_EXTENSIONS OFF) - - # installation path --set(TF_INC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include") --set(TF_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib") -+set(TF_INC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") -+set(TF_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") - set(TF_UTEST_DIR ${PROJECT_SOURCE_DIR}/unittests) - set(TF_EXAMPLE_DIR ${PROJECT_SOURCE_DIR}/examples) - set(TF_BENCHMARK_DIR ${PROJECT_SOURCE_DIR}/benchmarks) -@@ -782,7 +783,7 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets) - install( - EXPORT ${PROJECT_NAME}Targets - NAMESPACE ${PROJECT_NAME}:: -- DESTINATION ${TF_LIB_INSTALL_DIR}/cmake -+ DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} - ) - - # set up config -@@ -791,7 +792,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 -+ INSTALL_DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} - PATH_VARS TF_INC_INSTALL_DIR - ) - -@@ -803,6 +804,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 -+ DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} - ) - diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.3.1-optional-tests-examples.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.3.1-optional-tests-examples.patch deleted file mode 100644 index 279277e..0000000 --- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.3.1-optional-tests-examples.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3fccfd2..c267f84 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,8 +9,8 @@ set(CMAKE_VERBOSE_MAKEFILE ON) - project(Cpp-Taskflow VERSION 2.3.1 LANGUAGES CXX) - - # build options --option(TF_BUILD_EXAMPLES "Enables build of examples" ON) --option(TF_BUILD_TESTS "Enables build of tests" ON) -+option(TF_BUILD_EXAMPLES "Enables build of examples" OFF) -+option(TF_BUILD_TESTS "Enables build of tests" OFF) - option(TF_ENABLE_CUDA "Enables build of cuda code" OFF) - option(TF_BUILD_BENCHMARKS "Enables build of benchmarks" OFF) - -@@ -222,7 +222,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE - # Example program - # ----------------------------------------------------------------------------- - --if(${TF_BUILD_EXAMPLES}) -+if(TF_BUILD_EXAMPLES) - - message(STATUS "Building examples ...") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_EXAMPLE_DIR}) -@@ -282,13 +282,13 @@ target_link_libraries( - ) - endif(${TF_ENABLE_CUDA}) - --endif(${TF_BUILD_EXAMPLES}) # ---- if TF_BUILD_EXAMPLES -+endif(TF_BUILD_EXAMPLES) # ---- if TF_BUILD_EXAMPLES - - # ----------------------------------------------------------------------------- - # Unittest - # ----------------------------------------------------------------------------- - --if(${TF_BUILD_TESTS}) -+if(TF_BUILD_TESTS) - - enable_testing() - message(STATUS "Building unit tests ...") -@@ -504,7 +504,7 @@ add_test(cuda_matrix.product ${TF_UTEST_DIR}/cuda/cuda_matrix -tc=product) - - endif(${TF_ENABLE_CUDA}) - --endif(${TF_BUILD_TESTS}) -+endif(TF_BUILD_TESTS) - - # ----------------------------------------------------------------------------- - # Benchmarking (enabled by TF_BUILD_BENCHMARKS) diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix-lib-path.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix-lib-path.patch deleted file mode 100644 index 6a99a0b..0000000 --- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix-lib-path.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4b9c134..f49c398 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,6 +16,7 @@ option(TF_BUILD_TESTS "Enable build of tests" OFF) - - # Include additional language check - include(CheckLanguage) -+include(GNUInstallDirs) - - # Compiler vendors - ## g++ -@@ -166,8 +167,8 @@ target_link_libraries( - #set(CMAKE_CXX_EXTENSIONS OFF) - - # installation path --set(TF_INC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include") --set(TF_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib") -+set(TF_INC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") -+set(TF_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") - set(TF_UTEST_DIR ${PROJECT_SOURCE_DIR}/unittests) - set(TF_EXAMPLE_DIR ${PROJECT_SOURCE_DIR}/examples) - set(TF_BENCHMARK_DIR ${PROJECT_SOURCE_DIR}/benchmarks) -@@ -799,7 +800,7 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets) - install( - EXPORT ${PROJECT_NAME}Targets - NAMESPACE ${PROJECT_NAME}:: -- DESTINATION ${TF_LIB_INSTALL_DIR}/cmake -+ DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} - ) - - # set up config -@@ -808,7 +809,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 -+ INSTALL_DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} - PATH_VARS TF_INC_INSTALL_DIR - ) - -@@ -820,6 +821,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 -+ DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} - ) - diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix-version-number.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix-version-number.patch deleted file mode 100644 index 5b53c31..0000000 --- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix-version-number.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f49c398..834b32e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,7 +6,7 @@ MESSAGE(STATUS "CMAKE_ROOT: " ${CMAKE_ROOT}) - set(CMAKE_VERBOSE_MAKEFILE ON) - - # Project name --project(Cpp-Taskflow VERSION 2.3.1 LANGUAGES CXX) -+project(Cpp-Taskflow VERSION 2.4.0 LANGUAGES CXX) - - # build options - option(TF_ENABLE_CUDA "Enables build of cuda code" OFF) diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-optional-tests-examples.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-optional-tests-examples.patch deleted file mode 100644 index c1d8933..0000000 --- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-optional-tests-examples.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8debfa4..4b9c134 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,6 +11,8 @@ project(Cpp-Taskflow VERSION 2.3.1 LANGUAGES CXX) - # build options - option(TF_ENABLE_CUDA "Enables build of cuda code" OFF) - option(TF_BUILD_BENCHMARKS "Enables build of benchmarks" OFF) -+option(TF_BUILD_EXAMPLES "Enable build of examples" OFF) -+option(TF_BUILD_TESTS "Enable build of tests" OFF) - - # Include additional language check - include(CheckLanguage) -@@ -227,6 +229,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE - # Example program - # ----------------------------------------------------------------------------- - -+if (TF_BUILD_EXAMPLES) - message(STATUS "Building examples ...") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_EXAMPLE_DIR}) - -@@ -289,10 +292,12 @@ target_link_libraries( - device_property ${PROJECT_NAME} Threads::Threads tf::default_settings - ) - endif(${TF_ENABLE_CUDA}) -+endif(TF_BUILD_EXAMPLES) - - # ----------------------------------------------------------------------------- - # Unittest - # ----------------------------------------------------------------------------- -+if (TF_BUILD_TESTS) - enable_testing() - message(STATUS "Building unit tests ...") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_UTEST_DIR}) -@@ -516,6 +521,7 @@ add_test(cuda_matrix.transpose ${TF_UTEST_DIR}/cuda/cuda_matrix -tc=transpose) - add_test(cuda_matrix.product ${TF_UTEST_DIR}/cuda/cuda_matrix -tc=product) - - endif(${TF_ENABLE_CUDA}) -+endif(TF_BUILD_TESTS) - - # ----------------------------------------------------------------------------- - # Benchmarking (enabled by TF_BUILD_BENCHMARKS) diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-9999-fix-lib-path.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-9999-fix-lib-path.patch deleted file mode 100644 index 4969deb..0000000 --- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-9999-fix-lib-path.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0b483a5..83d9430 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -15,6 +15,7 @@ option(TF_BUILD_TESTS "Enable build of tests" OFF) - - # Include additional language check - include(CheckLanguage) -+include(GNUInstallDirs) - - # Compiler vendors - ## g++ -@@ -159,8 +160,8 @@ target_link_libraries( - #set(CMAKE_CXX_EXTENSIONS OFF) - - # installation path --set(TF_INC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include") --set(TF_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib") -+set(TF_INC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") -+set(TF_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") - set(TF_UTEST_DIR ${PROJECT_SOURCE_DIR}/unittests) - set(TF_EXAMPLE_DIR ${PROJECT_SOURCE_DIR}/examples) - set(TF_BENCHMARK_DIR ${PROJECT_SOURCE_DIR}/benchmarks) -@@ -835,7 +836,7 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets) - install( - EXPORT ${PROJECT_NAME}Targets - NAMESPACE ${PROJECT_NAME}:: -- DESTINATION ${TF_LIB_INSTALL_DIR}/cmake -+ DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} - ) - - # set up config -@@ -844,7 +845,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 -+ INSTALL_DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} - PATH_VARS TF_INC_INSTALL_DIR - ) - -@@ -856,6 +857,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 -+ DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} - ) - diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-9999-optional-tests-examples.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-9999-optional-tests-examples.patch deleted file mode 100644 index 94b1dbc..0000000 --- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-9999-optional-tests-examples.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 281f47f..0b483a5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10,6 +10,8 @@ project(Cpp-Taskflow VERSION 2.4.0 LANGUAGES CXX) - - # build options - option(TF_BUILD_BENCHMARKS "Enables build of benchmarks" OFF) -+option(TF_BUILD_EXAMPLES "Enable build of examples" OFF) -+option(TF_BUILD_TESTS "Enable build of tests" OFF) - - # Include additional language check - include(CheckLanguage) -@@ -219,6 +221,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE - # Example program - # ----------------------------------------------------------------------------- - -+if (TF_BUILD_EXAMPLES) - message(STATUS "Building examples ...") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_EXAMPLE_DIR}) - -@@ -291,10 +294,12 @@ target_link_libraries( - kmeans ${PROJECT_NAME} Threads::Threads tf::default_settings - ) - endif(CMAKE_CUDA_COMPILER) -+endif(TF_BUILD_EXAMPLES) - - # ----------------------------------------------------------------------------- - # Unittest - # ----------------------------------------------------------------------------- -+if (TF_BUILD_TESTS) - enable_testing() - message(STATUS "Building unit tests ...") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_UTEST_DIR}) -@@ -616,6 +621,7 @@ add_test(cuda_kmeans.1000.8C8G ${TF_UTEST_CUDA_KMEANS} -tc=kmeans.1000.8C8G) - add_test(cuda_kmeans.1000.16C16G ${TF_UTEST_CUDA_KMEANS} -tc=kmeans.1000.16C16G) - - endif(CMAKE_CUDA_COMPILER) -+endif(TF_BUILD_TESTS) - - # ----------------------------------------------------------------------------- - # Benchmarking (enabled by TF_BUILD_BENCHMARKS) diff --git a/dev-cpp/cpp-taskflow/metadata.xml b/dev-cpp/cpp-taskflow/metadata.xml deleted file mode 100644 index 23d1a01..0000000 --- a/dev-cpp/cpp-taskflow/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Cpp-Taskflow helps you quickly write parallel programs with high performance scalability and simultaneous high productivity. - - - m.santullo@posteo.net - Michele Santullo - - - cpp-taskflow/cpp-taskflow - https://github.com/cpp-taskflow/cpp-taskflow/issues - -