Commit 74f07337 authored by Dominik Charousset's avatar Dominik Charousset

Remove RIAC module, CASH and Nexus, relates #477

parent 18e9821c
[submodule "benchmarks"] [submodule "benchmarks"]
path = benchmarks path = benchmarks
url = ../benchmarks.git url = ../benchmarks.git
[submodule "nexus"]
path = nexus
url = ../nexus.git
[submodule "opencl"] [submodule "opencl"]
path = libcaf_opencl path = libcaf_opencl
url = ../opencl.git url = ../opencl.git
[submodule "libcaf_riac"]
path = libcaf_riac
url = ../riac.git
[submodule "libcaf_python"] [submodule "libcaf_python"]
path = libcaf_python path = libcaf_python
url = ../python.git url = ../python.git
[submodule "cash"]
path = cash
url = ../cash.git
...@@ -51,7 +51,6 @@ endif() ...@@ -51,7 +51,6 @@ endif()
if(NOT CAF_NO_IO) if(NOT CAF_NO_IO)
set(CAF_NO_IO no) set(CAF_NO_IO no)
else() else()
set(CAF_NO_RIAC yes)
set(CAF_NO_TOOLS yes) set(CAF_NO_TOOLS yes)
set(CAF_NO_PYTHON yes) set(CAF_NO_PYTHON yes)
endif() endif()
...@@ -393,7 +392,7 @@ macro(add_caf_lib name) ...@@ -393,7 +392,7 @@ macro(add_caf_lib name)
set(${lib_varname_static} ${static_target}) set(${lib_varname_static} ${static_target})
endif() endif()
add_unit_tests("${full_name}/test/*.cpp") add_unit_tests("${full_name}/test/*.cpp")
# add headers to include directories so other subprojects can use RIAC # add headers to include directories so other subprojects can use them
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/libcaf_${name}") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/libcaf_${name}")
endmacro() endmacro()
...@@ -446,9 +445,6 @@ if(NOT CAF_NO_OPENCL) ...@@ -446,9 +445,6 @@ if(NOT CAF_NO_OPENCL)
endif() endif()
endif() endif()
# build RIAC library if not being told otherwise
add_optional_caf_lib(riac)
# build Python binding if not being told otherwise # build Python binding if not being told otherwise
if(NOT CAF_NO_PYTHON AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libcaf_python/CMakeLists.txt") if(NOT CAF_NO_PYTHON AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libcaf_python/CMakeLists.txt")
add_subdirectory(libcaf_python) add_subdirectory(libcaf_python)
...@@ -460,12 +456,6 @@ add_optional_caf_binaries(examples) ...@@ -460,12 +456,6 @@ add_optional_caf_binaries(examples)
# build tools if not being told otherwise # build tools if not being told otherwise
add_optional_caf_binaries(tools) add_optional_caf_binaries(tools)
# build nexus if not being told otherwise
add_optional_caf_binaries(nexus CAF_NO_RIAC)
# build cash if not being told otherwise
add_optional_caf_binaries(cash CAF_NO_RIAC)
# build benchmarks if not being told otherwise # build benchmarks if not being told otherwise
add_optional_caf_binaries(benchmarks) add_optional_caf_binaries(benchmarks)
...@@ -603,9 +593,6 @@ invertYesNo(CAF_NO_IO CAF_BUILD_IO) ...@@ -603,9 +593,6 @@ invertYesNo(CAF_NO_IO CAF_BUILD_IO)
invertYesNo(CAF_NO_EXAMPLES CAF_BUILD_EXAMPLES) invertYesNo(CAF_NO_EXAMPLES CAF_BUILD_EXAMPLES)
invertYesNo(CAF_NO_TOOLS CAF_BUILD_TOOLS) invertYesNo(CAF_NO_TOOLS CAF_BUILD_TOOLS)
invertYesNo(CAF_NO_UNIT_TESTS CAF_BUILD_UNIT_TESTS) invertYesNo(CAF_NO_UNIT_TESTS CAF_BUILD_UNIT_TESTS)
invertYesNo(CAF_NO_RIAC CAF_BUILD_RIAC)
invertYesNo(CAF_NO_NEXUS CAF_BUILD_NEXUS)
invertYesNo(CAF_NO_CASH CAF_BUILD_CASH)
invertYesNo(CAF_NO_MEM_MANAGEMENT CAF_BUILD_MEM_MANAGEMENT) invertYesNo(CAF_NO_MEM_MANAGEMENT CAF_BUILD_MEM_MANAGEMENT)
invertYesNo(CAF_NO_BENCHMARKS CAF_BUILD_BENCHMARKS) invertYesNo(CAF_NO_BENCHMARKS CAF_BUILD_BENCHMARKS)
invertYesNo(CAF_NO_OPENCL CAF_BUILD_OPENCL) invertYesNo(CAF_NO_OPENCL CAF_BUILD_OPENCL)
...@@ -631,9 +618,6 @@ if(NOT CAF_NO_SUMMARY) ...@@ -631,9 +618,6 @@ if(NOT CAF_NO_SUMMARY)
"\nBuild tools: ${CAF_BUILD_TOOLS}" "\nBuild tools: ${CAF_BUILD_TOOLS}"
"\nBuild examples: ${CAF_BUILD_EXAMPLES}" "\nBuild examples: ${CAF_BUILD_EXAMPLES}"
"\nBuild unit tests: ${CAF_BUILD_UNIT_TESTS}" "\nBuild unit tests: ${CAF_BUILD_UNIT_TESTS}"
"\nBuild riac: ${CAF_BUILD_RIAC}"
"\nBuild nexus: ${CAF_BUILD_NEXUS}"
"\nBuild cash: ${CAF_BUILD_CASH}"
"\nBuild benchmarks: ${CAF_BUILD_BENCHMARKS}" "\nBuild benchmarks: ${CAF_BUILD_BENCHMARKS}"
"\nBuild opencl: ${CAF_BUILD_OPENCL}" "\nBuild opencl: ${CAF_BUILD_OPENCL}"
"\nBuild Python: ${CAF_BUILD_PYTHON}" "\nBuild Python: ${CAF_BUILD_PYTHON}"
......
Subproject commit 8ced15b1d03be8e371bc95cac4638f176a864594
...@@ -61,10 +61,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]... ...@@ -61,10 +61,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
--no-curl-examples build without libcurl examples --no-curl-examples build without libcurl examples
--no-unit-tests build without unit tests --no-unit-tests build without unit tests
--no-opencl build without OpenCL module --no-opencl build without OpenCL module
--no-nexus build without nexus
--no-cash build without cash
--no-benchmarks build without benchmarks --no-benchmarks build without benchmarks
--no-riac build without RIAC module
--no-tools build without CAF tools such as caf-run --no-tools build without CAF tools such as caf-run
--no-io build without I/O module --no-io build without I/O module
--no-python build without python binding --no-python build without python binding
...@@ -347,18 +344,9 @@ while [ $# -ne 0 ]; do ...@@ -347,18 +344,9 @@ while [ $# -ne 0 ]; do
--with-python-config=*) --with-python-config=*)
append_cache_entry CAF_PYTHON_CONFIG_BIN FILEPATH "$optarg" append_cache_entry CAF_PYTHON_CONFIG_BIN FILEPATH "$optarg"
;; ;;
--no-nexus)
append_cache_entry CAF_NO_NEXUS BOOL yes
;;
--no-cash)
append_cache_entry CAF_NO_CASH BOOL yes
;;
--no-benchmarks) --no-benchmarks)
append_cache_entry CAF_NO_BENCHMARKS BOOL yes append_cache_entry CAF_NO_BENCHMARKS BOOL yes
;; ;;
--no-riac)
append_cache_entry CAF_NO_RIAC BOOL yes
;;
--no-tools) --no-tools)
append_cache_entry CAF_NO_TOOLS BOOL yes append_cache_entry CAF_NO_TOOLS BOOL yes
;; ;;
......
Subproject commit ca58f9e98611053e8f94b01ef8bb23149aee0ec5
Subproject commit 8988ceadbd5c42c541443bbc0ba68292be493811
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment