diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
commit | f516638b7fe9592837389826a6152a7e1b251c54 (patch) | |
tree | 8bfecb640b7b6403d7a3d662d923eed630033da7 /dev-cpp/cpp-taskflow/files | |
parent | 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff) |
gentoo resync : 30.05.2020
Diffstat (limited to 'dev-cpp/cpp-taskflow/files')
-rw-r--r-- | dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-do_not_compile_examples.patch | 82 | ||||
-rw-r--r-- | dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix_installation_path.patch | 22 |
2 files changed, 104 insertions, 0 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 new file mode 100644 index 000000000000..99f4658adfe4 --- /dev/null +++ b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-do_not_compile_examples.patch @@ -0,0 +1,82 @@ +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 new file mode 100644 index 000000000000..f68e572f5ab2 --- /dev/null +++ b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix_installation_path.patch @@ -0,0 +1,22 @@ +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} + ) + + |