diff options
Diffstat (limited to 'dev-cpp/cpp-taskflow/files')
3 files changed, 79 insertions, 104 deletions
diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-do_not_compile_examples.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-do_not_compile_examples.patch deleted file mode 100644 index 99f4658adfe4..000000000000 --- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-do_not_compile_examples.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1bf8ed3..190dabe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -223,76 +223,10 @@ target_include_directories(${PROJECT_NAME} INTERFACE - $<INSTALL_INTERFACE:include/> - ) - --# ----------------------------------------------------------------------------- --# Example program --# ----------------------------------------------------------------------------- -- --message(STATUS "Building examples ...") --set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_EXAMPLE_DIR}) -- --add_executable(simple ${TF_EXAMPLE_DIR}/simple.cpp) --target_link_libraries( -- simple ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(observer ${TF_EXAMPLE_DIR}/observer.cpp) --target_link_libraries( -- observer ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(subflow ${TF_EXAMPLE_DIR}/subflow.cpp) --target_link_libraries( -- subflow ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(condition ${TF_EXAMPLE_DIR}/condition.cpp) --target_link_libraries( -- condition ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(visualization ${TF_EXAMPLE_DIR}/visualization.cpp) --target_link_libraries( -- visualization ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(reduce ${TF_EXAMPLE_DIR}/reduce.cpp) --target_link_libraries( -- reduce ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(parallel_for ${TF_EXAMPLE_DIR}/parallel_for.cpp) --target_link_libraries( -- parallel_for ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(run ${TF_EXAMPLE_DIR}/run.cpp) --target_link_libraries( -- run ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(composition ${TF_EXAMPLE_DIR}/composition.cpp) --target_link_libraries( -- composition ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --#### CUDA examples --if(${TF_ENABLE_CUDA}) --set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_EXAMPLE_DIR}/cuda) -- --add_executable(saxpy ${TF_EXAMPLE_DIR}/cuda/saxpy.cu) --target_link_libraries( -- saxpy ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(device_property ${TF_EXAMPLE_DIR}/cuda/device_property.cu) --target_link_libraries( -- device_property ${PROJECT_NAME} Threads::Threads tf::default_settings --) --endif(${TF_ENABLE_CUDA}) -- - # ----------------------------------------------------------------------------- - # Unittest - # ----------------------------------------------------------------------------- -+ - enable_testing() - message(STATUS "Building unit tests ...") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_UTEST_DIR}) diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix_installation_path.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix_installation_path.patch deleted file mode 100644 index f68e572f5ab2..000000000000 --- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix_installation_path.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 190dabe..6d613d6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,7 +6,7 @@ MESSAGE(STATUS "CMAKE_ROOT: " ${CMAKE_ROOT}) - #_cmake_modify_IGNORE 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) -@@ -748,7 +748,7 @@ 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-3.0.0-gnuinstalldir.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-3.0.0-gnuinstalldir.patch new file mode 100644 index 000000000000..8e974f2f8269 --- /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) |