dev-cpp/cpp-taskflow: adding package

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --force
Signed-off-by: Michele Santullo <m.santullo@posteo.net>
This commit is contained in:
Michele Santullo
2020-05-23 23:43:45 +02:00
parent 7fcd8d57a0
commit a71e8a1c65
12 changed files with 426 additions and 0 deletions

View File

@@ -0,0 +1,49 @@
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}
)

View File

@@ -0,0 +1,49 @@
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)

View File

@@ -0,0 +1,49 @@
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}
)

View File

@@ -0,0 +1,13 @@
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)

View File

@@ -0,0 +1,42 @@
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)

View File

@@ -0,0 +1,49 @@
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}
)

View File

@@ -0,0 +1,42 @@
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)