Commit 5441a064 authored by Dominik Charousset's avatar Dominik Charousset

Reorganize main repository

Add nexus, probe-event, and benchmarks as submodules and cleaned up all CMake
build scripts.
parent 068470bb
[submodule "benchmarks"]
path = benchmarks
url = https://github.com/actor-framework/benchmarks.git
[submodule "probe-event"]
path = probe-event
url = https://github.com/actor-framework/probe-event.git
[submodule "nexus"]
path = nexus
url = https://github.com/actor-framework/nexus.git
This diff is collapsed.
Subproject commit 5a0d36801a387b718e4bb1b34bcb75f3e6e25d3f
...@@ -5,15 +5,13 @@ int main() { ...@@ -5,15 +5,13 @@ int main() {
# ifdef __clang__ # ifdef __clang__
cout << __clang_major__ cout << __clang_major__
<< "." << "."
<< __clang_minor__ << __clang_minor__;
<< endl;
# elif defined(__GNUC__) # elif defined(__GNUC__)
cout << __GNUC__ cout << __GNUC__
<< "." << "."
<< __GNUC_MINOR__ << __GNUC_MINOR__;
<< endl;
# else # else
cout << "0.0" << endl; cout << "0.0";
# endif # endif
return 0; return 0;
} }
...@@ -181,27 +181,27 @@ while [ $# -ne 0 ]; do ...@@ -181,27 +181,27 @@ while [ $# -ne 0 ]; do
append_cache_entry CMAKE_INSTALL_PREFIX PATH $optarg append_cache_entry CMAKE_INSTALL_PREFIX PATH $optarg
;; ;;
--with-runtime-checks) --with-runtime-checks)
append_cache_entry CAF_ENABLE_RUNTIME_CHECKS BOOL true append_cache_entry CAF_ENABLE_RUNTIME_CHECKS BOOL yes
;; ;;
--enable-debug) --enable-debug)
echo "*** warning: --enable-debug is deprecated, please use --with-runtime-checks instead" echo "*** warning: --enable-debug is deprecated, please use --with-runtime-checks instead"
append_cache_entry CAF_ENABLE_RUNTIME_CHECKS BOOL true append_cache_entry CAF_ENABLE_RUNTIME_CHECKS BOOL yes
;; ;;
--enable-address-sanitizer) --enable-address-sanitizer)
append_cache_entry ENABLE_ADDRESS_SANITIZER BOOL true append_cache_entry ENABLE_ADDRESS_SANITIZER BOOL yes
;; ;;
--no-memory-management) --no-memory-management)
append_cache_entry DISABLE_MEM_MANAGEMENT BOOL true append_cache_entry CAF_NO_MEM_MANAGEMENT BOOL yes
;; ;;
--without-memory-management) --without-memory-management)
echo "*** WARNING: --without-memory-management is deprecated" echo "*** WARNING: --without-memory-management is deprecated"
append_cache_entry DISABLE_MEM_MANAGEMENT BOOL true append_cache_entry DISABLE_MEM_MANAGEMENT BOOL yes
;; ;;
--standalone-build) --standalone-build)
echo "*** WARNING: --standalone-build is deprecated" echo "*** WARNING: --standalone-build is deprecated"
;; ;;
--more-clang-warnings) --more-clang-warnings)
append_cache_entry MORE_CLANG_WARNINGS BOOL true append_cache_entry MORE_CLANG_WARNINGS BOOL yes
;; ;;
--with-log-level=*) --with-log-level=*)
level=`echo "$optarg" | tr '[:lower:]' '[:upper:]'` level=`echo "$optarg" | tr '[:lower:]' '[:upper:]'`
......
...@@ -14,7 +14,7 @@ endif () ...@@ -14,7 +14,7 @@ endif ()
macro(add name folder) macro(add name folder)
add_executable(${name} ${folder}/${name}.cpp ${ARGN}) add_executable(${name} ${folder}/${name}.cpp ${ARGN})
target_link_libraries(${name} target_link_libraries(${name}
${CMAKE_DL_LIBS} ${LD_FLAGS}
${LIBCAF_LIBRARIES} ${LIBCAF_LIBRARIES}
${PTHREAD_LIBRARIES} ${PTHREAD_LIBRARIES}
${WSLIB}) ${WSLIB})
......
Subproject commit 600a2a5ea21c9aa17d75bd4c28978349fbbd559b
Subproject commit 7592f1b6b8152445b2b7343d4d67a070001d742a
...@@ -8,9 +8,8 @@ include_directories(${LIBCAF_INCLUDE_DIRS}) ...@@ -8,9 +8,8 @@ include_directories(${LIBCAF_INCLUDE_DIRS})
macro(add_unit_test name) macro(add_unit_test name)
add_executable(test_${name} test_${name}.cpp test.cpp ${ARGN}) add_executable(test_${name} test_${name}.cpp test.cpp ${ARGN})
target_link_libraries(test_${name} target_link_libraries(test_${name}
${CMAKE_DL_LIBS} ${LD_FLAGS}
${LIBCAF_CORE_LIBRARY} ${LIBCAF_LIBRARIES}
${LIBCAF_IO_LIBRARY}
${PTHREAD_LIBRARIES}) ${PTHREAD_LIBRARIES})
add_test(${name} ${EXECUTABLE_OUTPUT_PATH}/test_${name}) add_test(${name} ${EXECUTABLE_OUTPUT_PATH}/test_${name})
add_dependencies(test_${name} all_unit_tests) add_dependencies(test_${name} all_unit_tests)
......
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