diff --git a/CMakeLists.txt b/CMakeLists.txt index 11fddd8..5408e81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,7 @@ add_subdirectory(base_c) add_subdirectory(base_cpp) add_subdirectory(mtapi_c) add_subdirectory(tasks_cpp) -add_subdirectory(mtapi_cpp_ext) +add_subdirectory(mtapi_cpp) add_subdirectory(containers_cpp) add_subdirectory(algorithms_cpp) add_subdirectory(dataflow_cpp) diff --git a/mtapi_cpp_ext/CMakeLists.txt b/mtapi_cpp/CMakeLists.txt similarity index 65% rename from mtapi_cpp_ext/CMakeLists.txt rename to mtapi_cpp/CMakeLists.txt index 79c7433..3652d63 100644 --- a/mtapi_cpp_ext/CMakeLists.txt +++ b/mtapi_cpp/CMakeLists.txt @@ -1,8 +1,8 @@ -project (project_mtapi_cpp_ext) +project (project_mtapi_cpp) -file(GLOB_RECURSE EMBB_MTAPI_CPP_EXT_SOURCES "src/*.cc" "src/*.h") -file(GLOB_RECURSE EMBB_MTAPI_CPP_EXT_HEADERS "include/*.h") -file(GLOB_RECURSE EMBB_MTAPI_CPP_EXT_TEST_SOURCES "test/*.cc" "test/*.h") +file(GLOB_RECURSE EMBB_MTAPI_CPP_SOURCES "src/*.cc" "src/*.h") +file(GLOB_RECURSE EMBB_MTAPI_CPP_HEADERS "include/*.h") +file(GLOB_RECURSE EMBB_MTAPI_CPP_TEST_SOURCES "test/*.cc" "test/*.h") if (USE_AUTOMATIC_INITIALIZATION STREQUAL ON) message("-- Automatic initialization enabled (default)") @@ -20,25 +20,25 @@ GroupSourcesMSVC(include) GroupSourcesMSVC(src) GroupSourcesMSVC(test) -set (EMBB_MTAPI_CPP_EXT_INCLUDE_DIRS "include" "src" "test") -include_directories(${EMBB_MTAPI_CPP_EXT_INCLUDE_DIRS} +set (EMBB_MTAPI_CPP_INCLUDE_DIRS "include" "src" "test") +include_directories(${EMBB_MTAPI_CPP_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/../base_c/include ${CMAKE_CURRENT_BINARY_DIR}/../base_c/include ${CMAKE_CURRENT_SOURCE_DIR}/../base_cpp/include ${CMAKE_CURRENT_BINARY_DIR}/../base_cpp/include ${CMAKE_CURRENT_SOURCE_DIR}/../mtapi_c/include) -add_library (embb_mtapi_cpp_ext ${EMBB_MTAPI_CPP_EXT_SOURCES} ${EMBB_MTAPI_CPP_EXT_HEADERS}) -target_link_libraries(embb_mtapi_cpp_ext embb_mtapi_c) +add_library (embb_mtapi_cpp ${EMBB_MTAPI_CPP_SOURCES} ${EMBB_MTAPI_CPP_HEADERS}) +target_link_libraries(embb_mtapi_cpp embb_mtapi_c) if (BUILD_TESTS STREQUAL ON) include_directories(${CMAKE_CURRENT_BINARY_DIR}/../partest/include) - add_executable (embb_mtapi_cpp_ext_test ${EMBB_MTAPI_CPP_EXT_TEST_SOURCES}) - target_link_libraries(embb_mtapi_cpp_ext_test embb_mtapi_cpp_ext embb_mtapi_c partest + add_executable (embb_mtapi_cpp_test ${EMBB_MTAPI_CPP_TEST_SOURCES}) + target_link_libraries(embb_mtapi_cpp_test embb_mtapi_cpp embb_mtapi_c partest embb_base_cpp embb_base_c ${compiler_libs}) - CopyBin(BIN embb_mtapi_cpp_ext_test DEST ${local_install_dir}) + CopyBin(BIN embb_mtapi_cpp_test DEST ${local_install_dir}) endif() install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include FILES_MATCHING PATTERN "*.h") -install(TARGETS embb_mtapi_cpp_ext DESTINATION lib) +install(TARGETS embb_mtapi_cpp DESTINATION lib) diff --git a/mtapi_cpp_ext/include/embb/mtapi_ext/action.h b/mtapi_cpp/include/embb/mtapi/action.h similarity index 97% rename from mtapi_cpp_ext/include/embb/mtapi_ext/action.h rename to mtapi_cpp/include/embb/mtapi/action.h index 1425595..182dbd8 100644 --- a/mtapi_cpp_ext/include/embb/mtapi_ext/action.h +++ b/mtapi_cpp/include/embb/mtapi/action.h @@ -27,9 +27,9 @@ #ifndef EMBB_MTAPI_ACTION_H_ #define EMBB_MTAPI_ACTION_H_ -#include -#include -#include +#include +#include +#include namespace embb { namespace mtapi { diff --git a/mtapi_cpp_ext/include/embb/mtapi_ext/action_attributes.h b/mtapi_cpp/include/embb/mtapi/action_attributes.h similarity index 98% rename from mtapi_cpp_ext/include/embb/mtapi_ext/action_attributes.h rename to mtapi_cpp/include/embb/mtapi/action_attributes.h index 410616f..6382cb9 100644 --- a/mtapi_cpp_ext/include/embb/mtapi_ext/action_attributes.h +++ b/mtapi_cpp/include/embb/mtapi/action_attributes.h @@ -28,8 +28,8 @@ #define EMBB_MTAPI_ACTION_ATTRIBUTES_H_ #include -#include -#include +#include +#include namespace embb { namespace mtapi { diff --git a/mtapi_cpp_ext/include/embb/mtapi_ext/affinity.h b/mtapi_cpp/include/embb/mtapi/affinity.h similarity index 99% rename from mtapi_cpp_ext/include/embb/mtapi_ext/affinity.h rename to mtapi_cpp/include/embb/mtapi/affinity.h index b7c902c..8127246 100644 --- a/mtapi_cpp_ext/include/embb/mtapi_ext/affinity.h +++ b/mtapi_cpp/include/embb/mtapi/affinity.h @@ -28,7 +28,7 @@ #define EMBB_MTAPI_AFFINITY_H_ #include -#include +#include namespace embb { namespace mtapi { diff --git a/mtapi_cpp_ext/include/embb/mtapi_ext/group.h b/mtapi_cpp/include/embb/mtapi/group.h similarity index 97% rename from mtapi_cpp_ext/include/embb/mtapi_ext/group.h rename to mtapi_cpp/include/embb/mtapi/group.h index 34253e8..510ee2e 100644 --- a/mtapi_cpp_ext/include/embb/mtapi_ext/group.h +++ b/mtapi_cpp/include/embb/mtapi/group.h @@ -28,10 +28,10 @@ #define EMBB_MTAPI_GROUP_H_ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace embb { diff --git a/mtapi_cpp_ext/include/embb/mtapi_ext/group_attributes.h b/mtapi_cpp/include/embb/mtapi/group_attributes.h similarity index 98% rename from mtapi_cpp_ext/include/embb/mtapi_ext/group_attributes.h rename to mtapi_cpp/include/embb/mtapi/group_attributes.h index 0aa76d1..6d1eed7 100644 --- a/mtapi_cpp_ext/include/embb/mtapi_ext/group_attributes.h +++ b/mtapi_cpp/include/embb/mtapi/group_attributes.h @@ -28,7 +28,7 @@ #define EMBB_MTAPI_GROUP_ATTRIBUTES_H_ #include -#include +#include namespace embb { namespace mtapi { diff --git a/mtapi_cpp_ext/include/embb/mtapi_ext/internal/check_status.h b/mtapi_cpp/include/embb/mtapi/internal/check_status.h similarity index 100% rename from mtapi_cpp_ext/include/embb/mtapi_ext/internal/check_status.h rename to mtapi_cpp/include/embb/mtapi/internal/check_status.h diff --git a/mtapi_cpp_ext/include/embb/mtapi_ext/job.h b/mtapi_cpp/include/embb/mtapi/job.h similarity index 98% rename from mtapi_cpp_ext/include/embb/mtapi_ext/job.h rename to mtapi_cpp/include/embb/mtapi/job.h index 9f9bdb9..c89f8b6 100644 --- a/mtapi_cpp_ext/include/embb/mtapi_ext/job.h +++ b/mtapi_cpp/include/embb/mtapi/job.h @@ -28,7 +28,7 @@ #define EMBB_MTAPI_JOB_H_ #include -#include +#include namespace embb { namespace mtapi { diff --git a/mtapi_cpp_ext/include/embb/mtapi_ext/mtapi.h b/mtapi_cpp/include/embb/mtapi/mtapi.h similarity index 83% rename from mtapi_cpp_ext/include/embb/mtapi_ext/mtapi.h rename to mtapi_cpp/include/embb/mtapi/mtapi.h index ab965af..6e863ec 100644 --- a/mtapi_cpp_ext/include/embb/mtapi_ext/mtapi.h +++ b/mtapi_cpp/include/embb/mtapi/mtapi.h @@ -35,12 +35,12 @@ * \ingroup CPP */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #endif // EMBB_MTAPI_MTAPI_H_ diff --git a/mtapi_cpp_ext/include/embb/mtapi_ext/node.h b/mtapi_cpp/include/embb/mtapi/node.h similarity index 96% rename from mtapi_cpp_ext/include/embb/mtapi_ext/node.h rename to mtapi_cpp/include/embb/mtapi/node.h index 20d76f2..4980149 100644 --- a/mtapi_cpp_ext/include/embb/mtapi_ext/node.h +++ b/mtapi_cpp/include/embb/mtapi/node.h @@ -29,11 +29,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace embb { diff --git a/mtapi_cpp_ext/include/embb/mtapi_ext/node_attributes.h b/mtapi_cpp/include/embb/mtapi/node_attributes.h similarity index 99% rename from mtapi_cpp_ext/include/embb/mtapi_ext/node_attributes.h rename to mtapi_cpp/include/embb/mtapi/node_attributes.h index bc6f73a..cd4a218 100644 --- a/mtapi_cpp_ext/include/embb/mtapi_ext/node_attributes.h +++ b/mtapi_cpp/include/embb/mtapi/node_attributes.h @@ -29,7 +29,7 @@ #include #include -#include +#include namespace embb { namespace mtapi { diff --git a/mtapi_cpp_ext/include/embb/mtapi_ext/queue.h b/mtapi_cpp/include/embb/mtapi/queue.h similarity index 92% rename from mtapi_cpp_ext/include/embb/mtapi_ext/queue.h rename to mtapi_cpp/include/embb/mtapi/queue.h index 081c86c..5a406ed 100644 --- a/mtapi_cpp_ext/include/embb/mtapi_ext/queue.h +++ b/mtapi_cpp/include/embb/mtapi/queue.h @@ -28,11 +28,11 @@ #define EMBB_MTAPI_QUEUE_H_ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace embb { diff --git a/mtapi_cpp_ext/include/embb/mtapi_ext/queue_attributes.h b/mtapi_cpp/include/embb/mtapi/queue_attributes.h similarity index 99% rename from mtapi_cpp_ext/include/embb/mtapi_ext/queue_attributes.h rename to mtapi_cpp/include/embb/mtapi/queue_attributes.h index e8d6558..7b8039e 100644 --- a/mtapi_cpp_ext/include/embb/mtapi_ext/queue_attributes.h +++ b/mtapi_cpp/include/embb/mtapi/queue_attributes.h @@ -28,7 +28,7 @@ #define EMBB_MTAPI_QUEUE_ATTRIBUTES_H_ #include -#include +#include namespace embb { namespace mtapi { diff --git a/mtapi_cpp_ext/include/embb/mtapi_ext/status_exception.h b/mtapi_cpp/include/embb/mtapi/status_exception.h similarity index 100% rename from mtapi_cpp_ext/include/embb/mtapi_ext/status_exception.h rename to mtapi_cpp/include/embb/mtapi/status_exception.h diff --git a/mtapi_cpp_ext/include/embb/mtapi_ext/task.h b/mtapi_cpp/include/embb/mtapi/task.h similarity index 99% rename from mtapi_cpp_ext/include/embb/mtapi_ext/task.h rename to mtapi_cpp/include/embb/mtapi/task.h index ba8ec9d..36bd23a 100644 --- a/mtapi_cpp_ext/include/embb/mtapi_ext/task.h +++ b/mtapi_cpp/include/embb/mtapi/task.h @@ -28,7 +28,7 @@ #define EMBB_MTAPI_TASK_H_ #include -#include +#include namespace embb { namespace mtapi { diff --git a/mtapi_cpp_ext/include/embb/mtapi_ext/task_attributes.h b/mtapi_cpp/include/embb/mtapi/task_attributes.h similarity index 99% rename from mtapi_cpp_ext/include/embb/mtapi_ext/task_attributes.h rename to mtapi_cpp/include/embb/mtapi/task_attributes.h index 6db352a..a009181 100644 --- a/mtapi_cpp_ext/include/embb/mtapi_ext/task_attributes.h +++ b/mtapi_cpp/include/embb/mtapi/task_attributes.h @@ -28,7 +28,7 @@ #define EMBB_MTAPI_TASK_ATTRIBUTES_H_ #include -#include +#include namespace embb { namespace mtapi { diff --git a/mtapi_cpp_ext/include/embb/mtapi_ext/task_context.h b/mtapi_cpp/include/embb/mtapi/task_context.h similarity index 99% rename from mtapi_cpp_ext/include/embb/mtapi_ext/task_context.h rename to mtapi_cpp/include/embb/mtapi/task_context.h index 6a43c6c..ebdbec6 100644 --- a/mtapi_cpp_ext/include/embb/mtapi_ext/task_context.h +++ b/mtapi_cpp/include/embb/mtapi/task_context.h @@ -28,7 +28,7 @@ #define EMBB_MTAPI_TASK_CONTEXT_H_ #include -#include +#include namespace embb { namespace mtapi { diff --git a/mtapi_cpp_ext/src/check_status.cc b/mtapi_cpp/src/check_status.cc similarity index 97% rename from mtapi_cpp_ext/src/check_status.cc rename to mtapi_cpp/src/check_status.cc index 6f20c88..7af10ae 100644 --- a/mtapi_cpp_ext/src/check_status.cc +++ b/mtapi_cpp/src/check_status.cc @@ -24,10 +24,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include -#include -#include +#include +#include #include namespace embb { diff --git a/mtapi_cpp_ext/src/node.cc b/mtapi_cpp/src/node.cc similarity index 96% rename from mtapi_cpp_ext/src/node.cc rename to mtapi_cpp/src/node.cc index 1b04b5a..80e9406 100644 --- a/mtapi_cpp_ext/src/node.cc +++ b/mtapi_cpp/src/node.cc @@ -24,7 +24,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include namespace embb { namespace mtapi { diff --git a/mtapi_cpp_ext/test/main.cc b/mtapi_cpp/test/main.cc similarity index 100% rename from mtapi_cpp_ext/test/main.cc rename to mtapi_cpp/test/main.cc diff --git a/mtapi_cpp_ext/test/mtapi_cpp_test_config.h b/mtapi_cpp/test/mtapi_cpp_test_config.h similarity index 96% rename from mtapi_cpp_ext/test/mtapi_cpp_test_config.h rename to mtapi_cpp/test/mtapi_cpp_test_config.h index cde1a1a..4b3c2d7 100644 --- a/mtapi_cpp_ext/test/mtapi_cpp_test_config.h +++ b/mtapi_cpp/test/mtapi_cpp_test_config.h @@ -28,7 +28,7 @@ #define MTAPI_CPP_TEST_MTAPI_CPP_TEST_CONFIG_H_ #include -#include +#include #define THIS_DOMAIN_ID 1 #define THIS_NODE_ID 1 diff --git a/mtapi_cpp_ext/test/mtapi_cpp_test_group.cc b/mtapi_cpp/test/mtapi_cpp_test_group.cc similarity index 100% rename from mtapi_cpp_ext/test/mtapi_cpp_test_group.cc rename to mtapi_cpp/test/mtapi_cpp_test_group.cc diff --git a/mtapi_cpp_ext/test/mtapi_cpp_test_group.h b/mtapi_cpp/test/mtapi_cpp_test_group.h similarity index 100% rename from mtapi_cpp_ext/test/mtapi_cpp_test_group.h rename to mtapi_cpp/test/mtapi_cpp_test_group.h diff --git a/mtapi_cpp_ext/test/mtapi_cpp_test_queue.cc b/mtapi_cpp/test/mtapi_cpp_test_queue.cc similarity index 100% rename from mtapi_cpp_ext/test/mtapi_cpp_test_queue.cc rename to mtapi_cpp/test/mtapi_cpp_test_queue.cc diff --git a/mtapi_cpp_ext/test/mtapi_cpp_test_queue.h b/mtapi_cpp/test/mtapi_cpp_test_queue.h similarity index 100% rename from mtapi_cpp_ext/test/mtapi_cpp_test_queue.h rename to mtapi_cpp/test/mtapi_cpp_test_queue.h diff --git a/mtapi_cpp_ext/test/mtapi_cpp_test_task.cc b/mtapi_cpp/test/mtapi_cpp_test_task.cc similarity index 100% rename from mtapi_cpp_ext/test/mtapi_cpp_test_task.cc rename to mtapi_cpp/test/mtapi_cpp_test_task.cc diff --git a/mtapi_cpp_ext/test/mtapi_cpp_test_task.h b/mtapi_cpp/test/mtapi_cpp_test_task.h similarity index 100% rename from mtapi_cpp_ext/test/mtapi_cpp_test_task.h rename to mtapi_cpp/test/mtapi_cpp_test_task.h