diff --git a/.github/workflows/clang-tidy-review.yml b/.github/workflows/clang-tidy-review.yml index b0af037df5..d5f9b59f51 100644 --- a/.github/workflows/clang-tidy-review.yml +++ b/.github/workflows/clang-tidy-review.yml @@ -32,7 +32,7 @@ jobs: build_dir: _build apt_packages: "cmake,ninja-build,build-essential,zlib1g-dev,qtbase5-dev,libhdf5-dev,libprotobuf-dev,libprotoc-dev,protobuf-compiler,libcurl4-openssl-dev,libqwt-qt5-dev,libyaml-cpp-dev" config_file: ".clang-tidy" - exclude: "ecal/core/src/serialization/nanopb/*,thirdparty/*,_build/*,convert_utf.cpp,convert_utf.h,testing/*" + exclude: "ecal/core/src/serialization/nanopb/*,thirdparty/*,_build/*,convert_utf.cpp,convert_utf.h,tests/*" split_workflow: true lgtm_comment_body: "" cmake_command: | diff --git a/CMakeLists.txt b/CMakeLists.txt index ea59989290..0c42672281 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -479,10 +479,10 @@ if(BUILD_ECAL_TESTS) # test contrib # ------------------------------------------------------ if(HAS_HDF5) - add_subdirectory(testing/contrib/ecalhdf5/hdf5_test) + add_subdirectory(tests/contrib/ecalhdf5/hdf5_test) endif() - add_subdirectory(testing/contrib/ecalproto/dynproto_test) - add_subdirectory(testing/contrib/ecalproto/ecal_proto_test) + add_subdirectory(tests/contrib/ecalproto/dynproto_test) + add_subdirectory(tests/contrib/ecalproto/ecal_proto_test) # ------------------------------------------------------ # test apps diff --git a/ecal/samples/c/pubsub/string/minimal_rec/CMakeLists.txt b/ecal/samples/c/pubsub/string/minimal_rec/CMakeLists.txt index 5808f6f8a2..52105bca82 100644 --- a/ecal/samples/c/pubsub/string/minimal_rec/CMakeLists.txt +++ b/ecal/samples/c/pubsub/string/minimal_rec/CMakeLists.txt @@ -40,4 +40,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/c/pubsub/string) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/c/pubsub/string) diff --git a/ecal/samples/c/pubsub/string/minimal_rec_cb/CMakeLists.txt b/ecal/samples/c/pubsub/string/minimal_rec_cb/CMakeLists.txt index d81a3ac536..4a0b429e8e 100644 --- a/ecal/samples/c/pubsub/string/minimal_rec_cb/CMakeLists.txt +++ b/ecal/samples/c/pubsub/string/minimal_rec_cb/CMakeLists.txt @@ -40,4 +40,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/c/pubsub/string) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/c/pubsub/string) diff --git a/ecal/samples/c/pubsub/string/minimal_snd/CMakeLists.txt b/ecal/samples/c/pubsub/string/minimal_snd/CMakeLists.txt index c6d6842e78..655dee5085 100644 --- a/ecal/samples/c/pubsub/string/minimal_snd/CMakeLists.txt +++ b/ecal/samples/c/pubsub/string/minimal_snd/CMakeLists.txt @@ -40,4 +40,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/c/pubsub/string) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/c/pubsub/string) diff --git a/ecal/samples/c/services/minimal_client_c/CMakeLists.txt b/ecal/samples/c/services/minimal_client_c/CMakeLists.txt index 6f9fe4c6a0..48d97b6b11 100644 --- a/ecal/samples/c/services/minimal_client_c/CMakeLists.txt +++ b/ecal/samples/c/services/minimal_client_c/CMakeLists.txt @@ -39,4 +39,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/c/services) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/c/services) diff --git a/ecal/samples/c/services/minimal_server_c/CMakeLists.txt b/ecal/samples/c/services/minimal_server_c/CMakeLists.txt index 578ce0ef87..acc620b455 100644 --- a/ecal/samples/c/services/minimal_server_c/CMakeLists.txt +++ b/ecal/samples/c/services/minimal_server_c/CMakeLists.txt @@ -39,4 +39,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/c/services) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/c/services) diff --git a/ecal/samples/cpp/benchmarks/counter_rec/CMakeLists.txt b/ecal/samples/cpp/benchmarks/counter_rec/CMakeLists.txt index fc290960da..be32ff2c19 100644 --- a/ecal/samples/cpp/benchmarks/counter_rec/CMakeLists.txt +++ b/ecal/samples/cpp/benchmarks/counter_rec/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/benchmarks/counter) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/benchmarks/counter) diff --git a/ecal/samples/cpp/benchmarks/counter_snd/CMakeLists.txt b/ecal/samples/cpp/benchmarks/counter_snd/CMakeLists.txt index e9b57c7677..ec05a75d03 100644 --- a/ecal/samples/cpp/benchmarks/counter_snd/CMakeLists.txt +++ b/ecal/samples/cpp/benchmarks/counter_snd/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/benchmarks/counter) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/benchmarks/counter) diff --git a/ecal/samples/cpp/benchmarks/datarate_rec/CMakeLists.txt b/ecal/samples/cpp/benchmarks/datarate_rec/CMakeLists.txt index a74db64b55..92a0884960 100644 --- a/ecal/samples/cpp/benchmarks/datarate_rec/CMakeLists.txt +++ b/ecal/samples/cpp/benchmarks/datarate_rec/CMakeLists.txt @@ -39,4 +39,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/benchmarks/datarate) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/benchmarks/datarate) diff --git a/ecal/samples/cpp/benchmarks/datarate_snd/CMakeLists.txt b/ecal/samples/cpp/benchmarks/datarate_snd/CMakeLists.txt index beb8331dd4..01a7d62c0d 100644 --- a/ecal/samples/cpp/benchmarks/datarate_snd/CMakeLists.txt +++ b/ecal/samples/cpp/benchmarks/datarate_snd/CMakeLists.txt @@ -39,4 +39,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/benchmarks/datarate) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/benchmarks/datarate) diff --git a/ecal/samples/cpp/benchmarks/dynsize_snd/CMakeLists.txt b/ecal/samples/cpp/benchmarks/dynsize_snd/CMakeLists.txt index 842660ceed..caf56512b4 100644 --- a/ecal/samples/cpp/benchmarks/dynsize_snd/CMakeLists.txt +++ b/ecal/samples/cpp/benchmarks/dynsize_snd/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/benchmarks/performance) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/benchmarks/performance) diff --git a/ecal/samples/cpp/benchmarks/latency_rec/CMakeLists.txt b/ecal/samples/cpp/benchmarks/latency_rec/CMakeLists.txt index 9593f1fbbf..7ad2d710fb 100644 --- a/ecal/samples/cpp/benchmarks/latency_rec/CMakeLists.txt +++ b/ecal/samples/cpp/benchmarks/latency_rec/CMakeLists.txt @@ -41,4 +41,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/benchmarks/latency) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/benchmarks/latency) diff --git a/ecal/samples/cpp/benchmarks/latency_snd/CMakeLists.txt b/ecal/samples/cpp/benchmarks/latency_snd/CMakeLists.txt index 68dde0835b..f1829204a4 100644 --- a/ecal/samples/cpp/benchmarks/latency_snd/CMakeLists.txt +++ b/ecal/samples/cpp/benchmarks/latency_snd/CMakeLists.txt @@ -39,4 +39,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/benchmarks/latency) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/benchmarks/latency) diff --git a/ecal/samples/cpp/benchmarks/many_connections_rec/CMakeLists.txt b/ecal/samples/cpp/benchmarks/many_connections_rec/CMakeLists.txt index bbb0f189e4..6afbc289db 100644 --- a/ecal/samples/cpp/benchmarks/many_connections_rec/CMakeLists.txt +++ b/ecal/samples/cpp/benchmarks/many_connections_rec/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/benchmarks/many_connections) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/benchmarks/many_connections) diff --git a/ecal/samples/cpp/benchmarks/many_connections_snd/CMakeLists.txt b/ecal/samples/cpp/benchmarks/many_connections_snd/CMakeLists.txt index 3788c3c53a..9977cde7d0 100644 --- a/ecal/samples/cpp/benchmarks/many_connections_snd/CMakeLists.txt +++ b/ecal/samples/cpp/benchmarks/many_connections_snd/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/benchmarks/many_connections) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/benchmarks/many_connections) diff --git a/ecal/samples/cpp/benchmarks/multiple_rec/CMakeLists.txt b/ecal/samples/cpp/benchmarks/multiple_rec/CMakeLists.txt index 912ae15c45..767f57ff3a 100644 --- a/ecal/samples/cpp/benchmarks/multiple_rec/CMakeLists.txt +++ b/ecal/samples/cpp/benchmarks/multiple_rec/CMakeLists.txt @@ -38,4 +38,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/benchmarks/multiple) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/benchmarks/multiple) diff --git a/ecal/samples/cpp/benchmarks/multiple_snd/CMakeLists.txt b/ecal/samples/cpp/benchmarks/multiple_snd/CMakeLists.txt index a6ab361da3..71b902572d 100644 --- a/ecal/samples/cpp/benchmarks/multiple_snd/CMakeLists.txt +++ b/ecal/samples/cpp/benchmarks/multiple_snd/CMakeLists.txt @@ -38,4 +38,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/benchmarks/multiple) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/benchmarks/multiple) diff --git a/ecal/samples/cpp/benchmarks/performance_rec/CMakeLists.txt b/ecal/samples/cpp/benchmarks/performance_rec/CMakeLists.txt index f9a2c71914..188ab00a56 100644 --- a/ecal/samples/cpp/benchmarks/performance_rec/CMakeLists.txt +++ b/ecal/samples/cpp/benchmarks/performance_rec/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/benchmarks/performance) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/benchmarks/performance) diff --git a/ecal/samples/cpp/benchmarks/performance_snd/CMakeLists.txt b/ecal/samples/cpp/benchmarks/performance_snd/CMakeLists.txt index 389fd5ff14..002a107b34 100644 --- a/ecal/samples/cpp/benchmarks/performance_snd/CMakeLists.txt +++ b/ecal/samples/cpp/benchmarks/performance_snd/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/benchmarks/performance) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/benchmarks/performance) diff --git a/ecal/samples/cpp/benchmarks/perftool/CMakeLists.txt b/ecal/samples/cpp/benchmarks/perftool/CMakeLists.txt index 5e60afc705..f819d38ecd 100644 --- a/ecal/samples/cpp/benchmarks/perftool/CMakeLists.txt +++ b/ecal/samples/cpp/benchmarks/perftool/CMakeLists.txt @@ -53,4 +53,4 @@ source_group(TREE "${CMAKE_CURRENT_LIST_DIR}" ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/benchmarks/perftool) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/benchmarks/perftool) diff --git a/ecal/samples/cpp/benchmarks/pubsub_throughput/CMakeLists.txt b/ecal/samples/cpp/benchmarks/pubsub_throughput/CMakeLists.txt index b2067110f6..15a8a46683 100644 --- a/ecal/samples/cpp/benchmarks/pubsub_throughput/CMakeLists.txt +++ b/ecal/samples/cpp/benchmarks/pubsub_throughput/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/benchmarks/performance) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/benchmarks/performance) diff --git a/ecal/samples/cpp/misc/process/CMakeLists.txt b/ecal/samples/cpp/misc/process/CMakeLists.txt index 5dcab2ac85..4621748949 100644 --- a/ecal/samples/cpp/misc/process/CMakeLists.txt +++ b/ecal/samples/cpp/misc/process/CMakeLists.txt @@ -40,5 +40,5 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/misc) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/misc) diff --git a/ecal/samples/cpp/misc/time/CMakeLists.txt b/ecal/samples/cpp/misc/time/CMakeLists.txt index b3a5cbb4bf..57b20d4d83 100644 --- a/ecal/samples/cpp/misc/time/CMakeLists.txt +++ b/ecal/samples/cpp/misc/time/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/misc) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/misc) diff --git a/ecal/samples/cpp/misc/timer/CMakeLists.txt b/ecal/samples/cpp/misc/timer/CMakeLists.txt index 5cf6f34958..f9d2a81c03 100644 --- a/ecal/samples/cpp/misc/timer/CMakeLists.txt +++ b/ecal/samples/cpp/misc/timer/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/misc) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/misc) diff --git a/ecal/samples/cpp/monitoring/monitoring_get_services/CMakeLists.txt b/ecal/samples/cpp/monitoring/monitoring_get_services/CMakeLists.txt index 4709535e01..7f3ded17b2 100644 --- a/ecal/samples/cpp/monitoring/monitoring_get_services/CMakeLists.txt +++ b/ecal/samples/cpp/monitoring/monitoring_get_services/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/monitoring) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/monitoring) diff --git a/ecal/samples/cpp/monitoring/monitoring_get_topics/CMakeLists.txt b/ecal/samples/cpp/monitoring/monitoring_get_topics/CMakeLists.txt index 0626c7c632..0ca50acc57 100644 --- a/ecal/samples/cpp/monitoring/monitoring_get_topics/CMakeLists.txt +++ b/ecal/samples/cpp/monitoring/monitoring_get_topics/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/monitoring) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/monitoring) diff --git a/ecal/samples/cpp/monitoring/monitoring_performance/CMakeLists.txt b/ecal/samples/cpp/monitoring/monitoring_performance/CMakeLists.txt index 66c3ccc454..66684dc8e4 100644 --- a/ecal/samples/cpp/monitoring/monitoring_performance/CMakeLists.txt +++ b/ecal/samples/cpp/monitoring/monitoring_performance/CMakeLists.txt @@ -41,4 +41,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/monitoring) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/monitoring) diff --git a/ecal/samples/cpp/monitoring/monitoring_rec/CMakeLists.txt b/ecal/samples/cpp/monitoring/monitoring_rec/CMakeLists.txt index 50deeaf3b2..f886805004 100644 --- a/ecal/samples/cpp/monitoring/monitoring_rec/CMakeLists.txt +++ b/ecal/samples/cpp/monitoring/monitoring_rec/CMakeLists.txt @@ -41,4 +41,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/monitoring) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/monitoring) diff --git a/ecal/samples/cpp/monitoring/monitoring_reg/CMakeLists.txt b/ecal/samples/cpp/monitoring/monitoring_reg/CMakeLists.txt index a0e43e2845..43a3318540 100644 --- a/ecal/samples/cpp/monitoring/monitoring_reg/CMakeLists.txt +++ b/ecal/samples/cpp/monitoring/monitoring_reg/CMakeLists.txt @@ -41,4 +41,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/monitoring) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/monitoring) diff --git a/ecal/samples/cpp/orchestration/component1/CMakeLists.txt b/ecal/samples/cpp/orchestration/component1/CMakeLists.txt index 4748678939..9591857a78 100644 --- a/ecal/samples/cpp/orchestration/component1/CMakeLists.txt +++ b/ecal/samples/cpp/orchestration/component1/CMakeLists.txt @@ -45,4 +45,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/orchestration) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/orchestration) diff --git a/ecal/samples/cpp/orchestration/component2/CMakeLists.txt b/ecal/samples/cpp/orchestration/component2/CMakeLists.txt index 27b7016fa5..a6e63e2e33 100644 --- a/ecal/samples/cpp/orchestration/component2/CMakeLists.txt +++ b/ecal/samples/cpp/orchestration/component2/CMakeLists.txt @@ -45,4 +45,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/orchestration) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/orchestration) diff --git a/ecal/samples/cpp/orchestration/orchestrator/CMakeLists.txt b/ecal/samples/cpp/orchestration/orchestrator/CMakeLists.txt index 30e291157a..8780f2d45b 100644 --- a/ecal/samples/cpp/orchestration/orchestrator/CMakeLists.txt +++ b/ecal/samples/cpp/orchestration/orchestrator/CMakeLists.txt @@ -44,4 +44,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/orchestration) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/orchestration) diff --git a/ecal/samples/cpp/pubsub/binary/binary_rec/CMakeLists.txt b/ecal/samples/cpp/pubsub/binary/binary_rec/CMakeLists.txt index 5abe694cd4..8170925bee 100644 --- a/ecal/samples/cpp/pubsub/binary/binary_rec/CMakeLists.txt +++ b/ecal/samples/cpp/pubsub/binary/binary_rec/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/pubsub/binary) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/binary) diff --git a/ecal/samples/cpp/pubsub/binary/binary_snd/CMakeLists.txt b/ecal/samples/cpp/pubsub/binary/binary_snd/CMakeLists.txt index 07dca80c71..e559a1b2a4 100644 --- a/ecal/samples/cpp/pubsub/binary/binary_snd/CMakeLists.txt +++ b/ecal/samples/cpp/pubsub/binary/binary_snd/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/pubsub/binary) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/binary) diff --git a/ecal/samples/cpp/pubsub/binary/binary_zero_copy_rec/CMakeLists.txt b/ecal/samples/cpp/pubsub/binary/binary_zero_copy_rec/CMakeLists.txt index 7d689208e3..849da83367 100644 --- a/ecal/samples/cpp/pubsub/binary/binary_zero_copy_rec/CMakeLists.txt +++ b/ecal/samples/cpp/pubsub/binary/binary_zero_copy_rec/CMakeLists.txt @@ -35,4 +35,4 @@ target_link_libraries(${PROJECT_NAME} eCAL::core) # install and set properties ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/pubsub/binary) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/binary) diff --git a/ecal/samples/cpp/pubsub/binary/binary_zero_copy_snd/CMakeLists.txt b/ecal/samples/cpp/pubsub/binary/binary_zero_copy_snd/CMakeLists.txt index be0e7b831c..d3268c50eb 100644 --- a/ecal/samples/cpp/pubsub/binary/binary_zero_copy_snd/CMakeLists.txt +++ b/ecal/samples/cpp/pubsub/binary/binary_zero_copy_snd/CMakeLists.txt @@ -35,4 +35,4 @@ target_link_libraries(${PROJECT_NAME} eCAL::core) # install and set properties ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/pubsub/binary) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/binary) diff --git a/ecal/samples/cpp/pubsub/binary/ping/CMakeLists.txt b/ecal/samples/cpp/pubsub/binary/ping/CMakeLists.txt index b9e67797d1..9147869d48 100644 --- a/ecal/samples/cpp/pubsub/binary/ping/CMakeLists.txt +++ b/ecal/samples/cpp/pubsub/binary/ping/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/pubsub/binary) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/binary) diff --git a/ecal/samples/cpp/pubsub/binary/pong/CMakeLists.txt b/ecal/samples/cpp/pubsub/binary/pong/CMakeLists.txt index ead972ee14..f76609ef9e 100644 --- a/ecal/samples/cpp/pubsub/binary/pong/CMakeLists.txt +++ b/ecal/samples/cpp/pubsub/binary/pong/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/pubsub/binary) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/binary) diff --git a/ecal/samples/cpp/pubsub/protobuf/person_events_rec/CMakeLists.txt b/ecal/samples/cpp/pubsub/protobuf/person_events_rec/CMakeLists.txt index 518ffa7c80..226946d9a3 100644 --- a/ecal/samples/cpp/pubsub/protobuf/person_events_rec/CMakeLists.txt +++ b/ecal/samples/cpp/pubsub/protobuf/person_events_rec/CMakeLists.txt @@ -46,4 +46,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/pubsub/protobuf) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/protobuf) diff --git a/ecal/samples/cpp/pubsub/protobuf/person_events_snd/CMakeLists.txt b/ecal/samples/cpp/pubsub/protobuf/person_events_snd/CMakeLists.txt index 20fe49f296..58099575cc 100644 --- a/ecal/samples/cpp/pubsub/protobuf/person_events_snd/CMakeLists.txt +++ b/ecal/samples/cpp/pubsub/protobuf/person_events_snd/CMakeLists.txt @@ -46,4 +46,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/pubsub/protobuf) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/protobuf) diff --git a/ecal/samples/cpp/pubsub/protobuf/person_loopback/CMakeLists.txt b/ecal/samples/cpp/pubsub/protobuf/person_loopback/CMakeLists.txt index 3f72cafe7c..e56cb98dd0 100644 --- a/ecal/samples/cpp/pubsub/protobuf/person_loopback/CMakeLists.txt +++ b/ecal/samples/cpp/pubsub/protobuf/person_loopback/CMakeLists.txt @@ -46,4 +46,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/pubsub/protobuf) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/protobuf) diff --git a/ecal/samples/cpp/pubsub/protobuf/person_rec/CMakeLists.txt b/ecal/samples/cpp/pubsub/protobuf/person_rec/CMakeLists.txt index 3f041ec60f..f933a3336f 100644 --- a/ecal/samples/cpp/pubsub/protobuf/person_rec/CMakeLists.txt +++ b/ecal/samples/cpp/pubsub/protobuf/person_rec/CMakeLists.txt @@ -46,4 +46,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/pubsub/protobuf) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/protobuf) diff --git a/ecal/samples/cpp/pubsub/protobuf/person_snd/CMakeLists.txt b/ecal/samples/cpp/pubsub/protobuf/person_snd/CMakeLists.txt index 6d8183caa6..48ca976d5a 100644 --- a/ecal/samples/cpp/pubsub/protobuf/person_snd/CMakeLists.txt +++ b/ecal/samples/cpp/pubsub/protobuf/person_snd/CMakeLists.txt @@ -46,4 +46,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/pubsub/protobuf) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/protobuf) diff --git a/ecal/samples/cpp/pubsub/protobuf/proto_dyn_json_rec/CMakeLists.txt b/ecal/samples/cpp/pubsub/protobuf/proto_dyn_json_rec/CMakeLists.txt index d81dedf6f1..82b0592326 100644 --- a/ecal/samples/cpp/pubsub/protobuf/proto_dyn_json_rec/CMakeLists.txt +++ b/ecal/samples/cpp/pubsub/protobuf/proto_dyn_json_rec/CMakeLists.txt @@ -38,4 +38,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/pubsub/protobuf) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/protobuf) diff --git a/ecal/samples/cpp/pubsub/protobuf/proto_dyn_rec/CMakeLists.txt b/ecal/samples/cpp/pubsub/protobuf/proto_dyn_rec/CMakeLists.txt index 85e416ca67..a92a380ff1 100644 --- a/ecal/samples/cpp/pubsub/protobuf/proto_dyn_rec/CMakeLists.txt +++ b/ecal/samples/cpp/pubsub/protobuf/proto_dyn_rec/CMakeLists.txt @@ -41,4 +41,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/pubsub/protobuf) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/protobuf) diff --git a/ecal/samples/cpp/pubsub/protobuf/proto_dyn_snd/CMakeLists.txt b/ecal/samples/cpp/pubsub/protobuf/proto_dyn_snd/CMakeLists.txt index 778bbe2eeb..b40e685040 100644 --- a/ecal/samples/cpp/pubsub/protobuf/proto_dyn_snd/CMakeLists.txt +++ b/ecal/samples/cpp/pubsub/protobuf/proto_dyn_snd/CMakeLists.txt @@ -46,4 +46,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/pubsub/protobuf) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/protobuf) diff --git a/ecal/samples/cpp/pubsub/string/minimal_rec/CMakeLists.txt b/ecal/samples/cpp/pubsub/string/minimal_rec/CMakeLists.txt index 53dba3cee1..d622abc303 100644 --- a/ecal/samples/cpp/pubsub/string/minimal_rec/CMakeLists.txt +++ b/ecal/samples/cpp/pubsub/string/minimal_rec/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/pubsub/string) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/string) diff --git a/ecal/samples/cpp/pubsub/string/minimal_rec_cb/CMakeLists.txt b/ecal/samples/cpp/pubsub/string/minimal_rec_cb/CMakeLists.txt index 1007b696a4..250ca73777 100644 --- a/ecal/samples/cpp/pubsub/string/minimal_rec_cb/CMakeLists.txt +++ b/ecal/samples/cpp/pubsub/string/minimal_rec_cb/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/pubsub/string) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/string) diff --git a/ecal/samples/cpp/pubsub/string/minimal_snd/CMakeLists.txt b/ecal/samples/cpp/pubsub/string/minimal_snd/CMakeLists.txt index 3fa02ec104..086cd9dc9c 100644 --- a/ecal/samples/cpp/pubsub/string/minimal_snd/CMakeLists.txt +++ b/ecal/samples/cpp/pubsub/string/minimal_snd/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/pubsub/string) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/string) diff --git a/ecal/samples/cpp/services/latency_client/CMakeLists.txt b/ecal/samples/cpp/services/latency_client/CMakeLists.txt index 3cf25f0812..999b78ad8a 100644 --- a/ecal/samples/cpp/services/latency_client/CMakeLists.txt +++ b/ecal/samples/cpp/services/latency_client/CMakeLists.txt @@ -38,4 +38,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/services/latency) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/services/latency) diff --git a/ecal/samples/cpp/services/latency_server/CMakeLists.txt b/ecal/samples/cpp/services/latency_server/CMakeLists.txt index 1771ad6559..bd769ab04a 100644 --- a/ecal/samples/cpp/services/latency_server/CMakeLists.txt +++ b/ecal/samples/cpp/services/latency_server/CMakeLists.txt @@ -38,4 +38,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/services/latency) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/services/latency) diff --git a/ecal/samples/cpp/services/math_client/CMakeLists.txt b/ecal/samples/cpp/services/math_client/CMakeLists.txt index 3ee4753568..2f261e16dc 100644 --- a/ecal/samples/cpp/services/math_client/CMakeLists.txt +++ b/ecal/samples/cpp/services/math_client/CMakeLists.txt @@ -45,4 +45,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/services/math) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/services/math) diff --git a/ecal/samples/cpp/services/math_server/CMakeLists.txt b/ecal/samples/cpp/services/math_server/CMakeLists.txt index 4c753a76ea..c0d0b97dbb 100644 --- a/ecal/samples/cpp/services/math_server/CMakeLists.txt +++ b/ecal/samples/cpp/services/math_server/CMakeLists.txt @@ -45,4 +45,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/services/math) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/services/math) diff --git a/ecal/samples/cpp/services/minimal_client/CMakeLists.txt b/ecal/samples/cpp/services/minimal_client/CMakeLists.txt index 73d624a666..ce2abf3b5a 100644 --- a/ecal/samples/cpp/services/minimal_client/CMakeLists.txt +++ b/ecal/samples/cpp/services/minimal_client/CMakeLists.txt @@ -38,4 +38,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/services/minimal) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/services/minimal) diff --git a/ecal/samples/cpp/services/minimal_server/CMakeLists.txt b/ecal/samples/cpp/services/minimal_server/CMakeLists.txt index bacdf3c7ff..730a5eab3a 100644 --- a/ecal/samples/cpp/services/minimal_server/CMakeLists.txt +++ b/ecal/samples/cpp/services/minimal_server/CMakeLists.txt @@ -38,4 +38,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/services/minimal) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/services/minimal) diff --git a/ecal/samples/cpp/services/ping_client/CMakeLists.txt b/ecal/samples/cpp/services/ping_client/CMakeLists.txt index a1e5f056b1..e9453973ef 100644 --- a/ecal/samples/cpp/services/ping_client/CMakeLists.txt +++ b/ecal/samples/cpp/services/ping_client/CMakeLists.txt @@ -45,4 +45,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/services/ping) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/services/ping) diff --git a/ecal/samples/cpp/services/ping_client_dyn/CMakeLists.txt b/ecal/samples/cpp/services/ping_client_dyn/CMakeLists.txt index 42ed2025d5..4482f70b4b 100644 --- a/ecal/samples/cpp/services/ping_client_dyn/CMakeLists.txt +++ b/ecal/samples/cpp/services/ping_client_dyn/CMakeLists.txt @@ -41,4 +41,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/services/ping) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/services/ping) diff --git a/ecal/samples/cpp/services/ping_server/CMakeLists.txt b/ecal/samples/cpp/services/ping_server/CMakeLists.txt index 12fb0fc294..591c13563b 100644 --- a/ecal/samples/cpp/services/ping_server/CMakeLists.txt +++ b/ecal/samples/cpp/services/ping_server/CMakeLists.txt @@ -45,4 +45,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/samples/cpp/services/ping) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/services/ping) diff --git a/ecal/tests/c/core_test/CMakeLists.txt b/ecal/tests/c/core_test/CMakeLists.txt index 91a02e8197..8f27563264 100644 --- a/ecal/tests/c/core_test/CMakeLists.txt +++ b/ecal/tests/c/core_test/CMakeLists.txt @@ -38,7 +38,7 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_gtest(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/tests/c/core) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER tests/c/core) source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${${PROJECT_NAME}_src} diff --git a/ecal/tests/cpp/clientserver_proto_test/CMakeLists.txt b/ecal/tests/cpp/clientserver_proto_test/CMakeLists.txt index 69b0c60ea9..3e9c398386 100644 --- a/ecal/tests/cpp/clientserver_proto_test/CMakeLists.txt +++ b/ecal/tests/cpp/clientserver_proto_test/CMakeLists.txt @@ -47,7 +47,7 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_gtest(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/tests/cpp/service) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER tests/cpp/service) source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${${PROJECT_NAME}_src} diff --git a/ecal/tests/cpp/clientserver_test/CMakeLists.txt b/ecal/tests/cpp/clientserver_test/CMakeLists.txt index 67d9c13067..5c9877d9af 100644 --- a/ecal/tests/cpp/clientserver_test/CMakeLists.txt +++ b/ecal/tests/cpp/clientserver_test/CMakeLists.txt @@ -40,7 +40,7 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_gtest(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/tests/cpp/service) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER tests/cpp/service) source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${${PROJECT_NAME}_src} diff --git a/ecal/tests/cpp/core_test/CMakeLists.txt b/ecal/tests/cpp/core_test/CMakeLists.txt index a08fd7db2f..c1fc147660 100644 --- a/ecal/tests/cpp/core_test/CMakeLists.txt +++ b/ecal/tests/cpp/core_test/CMakeLists.txt @@ -38,7 +38,7 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_gtest(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/tests/cpp/core) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER tests/cpp/core) source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${${PROJECT_NAME}_src} diff --git a/ecal/tests/cpp/event_test/CMakeLists.txt b/ecal/tests/cpp/event_test/CMakeLists.txt index 997a4cb8a1..21acb22f9e 100644 --- a/ecal/tests/cpp/event_test/CMakeLists.txt +++ b/ecal/tests/cpp/event_test/CMakeLists.txt @@ -41,7 +41,7 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_gtest(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/tests/cpp/io) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER tests/cpp/io) source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${${PROJECT_NAME}_src} diff --git a/ecal/tests/cpp/expmap_test/CMakeLists.txt b/ecal/tests/cpp/expmap_test/CMakeLists.txt index 7e55e7afcb..22fc3ea9b0 100644 --- a/ecal/tests/cpp/expmap_test/CMakeLists.txt +++ b/ecal/tests/cpp/expmap_test/CMakeLists.txt @@ -39,7 +39,7 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_gtest(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/tests/cpp/core) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER tests/cpp/core) source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${${PROJECT_NAME}_src} diff --git a/ecal/tests/cpp/io_memfile_test/CMakeLists.txt b/ecal/tests/cpp/io_memfile_test/CMakeLists.txt index 655715431b..b2e7389ddf 100644 --- a/ecal/tests/cpp/io_memfile_test/CMakeLists.txt +++ b/ecal/tests/cpp/io_memfile_test/CMakeLists.txt @@ -60,7 +60,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE ECAL_CORE_TRANSPORT_SHM) ecal_install_gtest(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/tests/cpp/io) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER tests/cpp/io) source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${${PROJECT_NAME}_src} diff --git a/ecal/tests/cpp/pubsub_proto_test/CMakeLists.txt b/ecal/tests/cpp/pubsub_proto_test/CMakeLists.txt index 1b5d3454fc..93afdae789 100644 --- a/ecal/tests/cpp/pubsub_proto_test/CMakeLists.txt +++ b/ecal/tests/cpp/pubsub_proto_test/CMakeLists.txt @@ -50,7 +50,7 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_gtest(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/tests/cpp/pubsub) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER tests/cpp/pubsub) source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${${PROJECT_NAME}_src} diff --git a/ecal/tests/cpp/pubsub_test/CMakeLists.txt b/ecal/tests/cpp/pubsub_test/CMakeLists.txt index 54aed22b02..3243b3daad 100644 --- a/ecal/tests/cpp/pubsub_test/CMakeLists.txt +++ b/ecal/tests/cpp/pubsub_test/CMakeLists.txt @@ -40,7 +40,7 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_gtest(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/tests/cpp/pubsub) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER tests/cpp/pubsub) source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${${PROJECT_NAME}_src} diff --git a/ecal/tests/cpp/serialization_test/CMakeLists.txt b/ecal/tests/cpp/serialization_test/CMakeLists.txt index fc8fa806d7..17e933c00b 100644 --- a/ecal/tests/cpp/serialization_test/CMakeLists.txt +++ b/ecal/tests/cpp/serialization_test/CMakeLists.txt @@ -109,7 +109,7 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_gtest(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/tests/cpp/core) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER tests/cpp/core) source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${${PROJECT_NAME}_src} diff --git a/ecal/tests/cpp/topic2mcast_test/CMakeLists.txt b/ecal/tests/cpp/topic2mcast_test/CMakeLists.txt index 0b32c63d1b..7336a57e58 100644 --- a/ecal/tests/cpp/topic2mcast_test/CMakeLists.txt +++ b/ecal/tests/cpp/topic2mcast_test/CMakeLists.txt @@ -39,7 +39,7 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_gtest(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/tests/cpp/core) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER tests/cpp/core) source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${${PROJECT_NAME}_src} diff --git a/ecal/tests/cpp/util_test/CMakeLists.txt b/ecal/tests/cpp/util_test/CMakeLists.txt index 0a1a80d421..d46da381f5 100644 --- a/ecal/tests/cpp/util_test/CMakeLists.txt +++ b/ecal/tests/cpp/util_test/CMakeLists.txt @@ -38,7 +38,7 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_gtest(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER core/tests/cpp/util) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER tests/cpp/util) source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${${PROJECT_NAME}_src} diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 7f9fcaf88a..dca119e633 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -28,7 +28,7 @@ endif(HAS_HDF5) # -------------------------------------------------------- # measurement if(HAS_HDF5) -add_subdirectory(cpp/benchmarks/measurement) +add_subdirectory(cpp/measurement/benchmark) add_subdirectory(cpp/measurement/measurement_read) add_subdirectory(cpp/measurement/measurement_write) endif(HAS_HDF5) diff --git a/samples/cpp/benchmarks/measurement/CMakeLists.txt b/samples/cpp/measurement/benchmark/CMakeLists.txt similarity index 97% rename from samples/cpp/benchmarks/measurement/CMakeLists.txt rename to samples/cpp/measurement/benchmark/CMakeLists.txt index 4d8a44a28f..866cf80937 100644 --- a/samples/cpp/benchmarks/measurement/CMakeLists.txt +++ b/samples/cpp/measurement/benchmark/CMakeLists.txt @@ -34,4 +34,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_sample(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/benchmarks/measurement) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/measurement) diff --git a/samples/cpp/benchmarks/measurement/src/main.cpp b/samples/cpp/measurement/benchmark/src/main.cpp similarity index 100% rename from samples/cpp/benchmarks/measurement/src/main.cpp rename to samples/cpp/measurement/benchmark/src/main.cpp diff --git a/samples/csharp/services/minimal_client/CMakeLists.txt b/samples/csharp/services/minimal_client/CMakeLists.txt index c20d707f5a..5fad8e63f2 100644 --- a/samples/csharp/services/minimal_client/CMakeLists.txt +++ b/samples/csharp/services/minimal_client/CMakeLists.txt @@ -25,4 +25,4 @@ ecal_add_sample(minimal_client_cs minimal_client.cs) target_link_libraries(minimal_client_cs PRIVATE Continental.eCAL.Core) -set_property(TARGET minimal_client_cs PROPERTY FOLDER samples/csharp/services) +set_property(TARGET minimal_client_cs PROPERTY FOLDER samples/csharp/services/minimal) diff --git a/samples/csharp/services/minimal_server/CMakeLists.txt b/samples/csharp/services/minimal_server/CMakeLists.txt index 74ad6950f7..73ff6d6485 100644 --- a/samples/csharp/services/minimal_server/CMakeLists.txt +++ b/samples/csharp/services/minimal_server/CMakeLists.txt @@ -25,4 +25,4 @@ ecal_add_sample(minimal_server_cs minimal_server.cs) target_link_libraries(minimal_server_cs PRIVATE Continental.eCAL.Core) -set_property(TARGET minimal_server_cs PROPERTY FOLDER samples/csharp/services) +set_property(TARGET minimal_server_cs PROPERTY FOLDER samples/csharp/services/minimal) diff --git a/testing/contrib/cross/.dockerignore b/tests/contrib/cross/.dockerignore similarity index 100% rename from testing/contrib/cross/.dockerignore rename to tests/contrib/cross/.dockerignore diff --git a/testing/contrib/cross/.gitignore b/tests/contrib/cross/.gitignore similarity index 100% rename from testing/contrib/cross/.gitignore rename to tests/contrib/cross/.gitignore diff --git a/testing/contrib/cross/Makefile b/tests/contrib/cross/Makefile similarity index 96% rename from testing/contrib/cross/Makefile rename to tests/contrib/cross/Makefile index adddf0ee51..20ca5eed91 100644 --- a/testing/contrib/cross/Makefile +++ b/tests/contrib/cross/Makefile @@ -16,7 +16,7 @@ run-host: build-host docker run --rm -it \ -u $(shell id -u):$(shell id -u) \ -v $(PWD)/../../..:/workspaces/ecal \ - -w /workspaces/ecal/testing/contrib/cross \ + -w /workspaces/ecal/tests/contrib/cross \ ecal-crossbuild-host \ /bin/bash diff --git a/testing/contrib/cross/README.md b/tests/contrib/cross/README.md similarity index 100% rename from testing/contrib/cross/README.md rename to tests/contrib/cross/README.md diff --git a/testing/contrib/cross/host/Dockerfile b/tests/contrib/cross/host/Dockerfile similarity index 100% rename from testing/contrib/cross/host/Dockerfile rename to tests/contrib/cross/host/Dockerfile diff --git a/testing/contrib/cross/target/ubuntu18.Dockerfile b/tests/contrib/cross/target/ubuntu18.Dockerfile similarity index 100% rename from testing/contrib/cross/target/ubuntu18.Dockerfile rename to tests/contrib/cross/target/ubuntu18.Dockerfile diff --git a/testing/contrib/cross/toolchain-arm64.cmake b/tests/contrib/cross/toolchain-arm64.cmake similarity index 86% rename from testing/contrib/cross/toolchain-arm64.cmake rename to tests/contrib/cross/toolchain-arm64.cmake index 22ca5d3a9d..dc92743ba2 100644 --- a/testing/contrib/cross/toolchain-arm64.cmake +++ b/tests/contrib/cross/toolchain-arm64.cmake @@ -10,7 +10,7 @@ set(cross_root /usr/bin/${cross_triple}) set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc) set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++) -set(CMAKE_SYSROOT "${WORKSPACE_ROOT}/testing/contrib/cross/artifacts/sysroot") +set(CMAKE_SYSROOT "${WORKSPACE_ROOT}/tests/contrib/cross/artifacts/sysroot") set(CMAKE_FIND_ROOT_PATH ${cross_root} ${CMAKE_SYSROOT}) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) diff --git a/testing/contrib/ecalhdf5/hdf5_test/CMakeLists.txt b/tests/contrib/ecalhdf5/hdf5_test/CMakeLists.txt similarity index 93% rename from testing/contrib/ecalhdf5/hdf5_test/CMakeLists.txt rename to tests/contrib/ecalhdf5/hdf5_test/CMakeLists.txt index 714aa1f947..a637c7e1c8 100644 --- a/testing/contrib/ecalhdf5/hdf5_test/CMakeLists.txt +++ b/tests/contrib/ecalhdf5/hdf5_test/CMakeLists.txt @@ -36,4 +36,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_gtest(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER testing/contrib/ecalhdf5) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER tests/cpp/contrib/ecalhdf5) diff --git a/testing/contrib/ecalhdf5/hdf5_test/src/hdf5_test.cpp b/tests/contrib/ecalhdf5/hdf5_test/src/hdf5_test.cpp similarity index 100% rename from testing/contrib/ecalhdf5/hdf5_test/src/hdf5_test.cpp rename to tests/contrib/ecalhdf5/hdf5_test/src/hdf5_test.cpp diff --git a/testing/contrib/ecalproto/dynproto_test/CMakeLists.txt b/tests/contrib/ecalproto/dynproto_test/CMakeLists.txt similarity index 95% rename from testing/contrib/ecalproto/dynproto_test/CMakeLists.txt rename to tests/contrib/ecalproto/dynproto_test/CMakeLists.txt index 2017e1b001..6ce0c1eee4 100644 --- a/testing/contrib/ecalproto/dynproto_test/CMakeLists.txt +++ b/tests/contrib/ecalproto/dynproto_test/CMakeLists.txt @@ -48,4 +48,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_gtest(${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER testing/contrib/ecalproto) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER tests/cpp/contrib/ecalproto) diff --git a/testing/contrib/ecalproto/dynproto_test/src/dynproto_test.cpp b/tests/contrib/ecalproto/dynproto_test/src/dynproto_test.cpp similarity index 100% rename from testing/contrib/ecalproto/dynproto_test/src/dynproto_test.cpp rename to tests/contrib/ecalproto/dynproto_test/src/dynproto_test.cpp diff --git a/testing/contrib/ecalproto/dynproto_test/src/protobuf/animal.proto b/tests/contrib/ecalproto/dynproto_test/src/protobuf/animal.proto similarity index 100% rename from testing/contrib/ecalproto/dynproto_test/src/protobuf/animal.proto rename to tests/contrib/ecalproto/dynproto_test/src/protobuf/animal.proto diff --git a/testing/contrib/ecalproto/dynproto_test/src/protobuf/attitude.proto b/tests/contrib/ecalproto/dynproto_test/src/protobuf/attitude.proto similarity index 100% rename from testing/contrib/ecalproto/dynproto_test/src/protobuf/attitude.proto rename to tests/contrib/ecalproto/dynproto_test/src/protobuf/attitude.proto diff --git a/testing/contrib/ecalproto/dynproto_test/src/protobuf/house.proto b/tests/contrib/ecalproto/dynproto_test/src/protobuf/house.proto similarity index 100% rename from testing/contrib/ecalproto/dynproto_test/src/protobuf/house.proto rename to tests/contrib/ecalproto/dynproto_test/src/protobuf/house.proto diff --git a/testing/contrib/ecalproto/dynproto_test/src/protobuf/person.proto b/tests/contrib/ecalproto/dynproto_test/src/protobuf/person.proto similarity index 100% rename from testing/contrib/ecalproto/dynproto_test/src/protobuf/person.proto rename to tests/contrib/ecalproto/dynproto_test/src/protobuf/person.proto diff --git a/testing/contrib/ecalproto/ecal_proto_test/CMakeLists.txt b/tests/contrib/ecalproto/ecal_proto_test/CMakeLists.txt similarity index 94% rename from testing/contrib/ecalproto/ecal_proto_test/CMakeLists.txt rename to tests/contrib/ecalproto/ecal_proto_test/CMakeLists.txt index 0685a3996d..d43a2eb89e 100644 --- a/testing/contrib/ecalproto/ecal_proto_test/CMakeLists.txt +++ b/tests/contrib/ecalproto/ecal_proto_test/CMakeLists.txt @@ -47,4 +47,4 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) ecal_install_gtest(${PROJECT_NAME} ${PROJECT_NAME}) -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER testing/contrib/ecalproto) +set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER tests/cpp/contrib/ecalproto) diff --git a/testing/contrib/ecalproto/ecal_proto_test/src/protobuf/animal.proto b/tests/contrib/ecalproto/ecal_proto_test/src/protobuf/animal.proto similarity index 100% rename from testing/contrib/ecalproto/ecal_proto_test/src/protobuf/animal.proto rename to tests/contrib/ecalproto/ecal_proto_test/src/protobuf/animal.proto diff --git a/testing/contrib/ecalproto/ecal_proto_test/src/protobuf/house.proto b/tests/contrib/ecalproto/ecal_proto_test/src/protobuf/house.proto similarity index 100% rename from testing/contrib/ecalproto/ecal_proto_test/src/protobuf/house.proto rename to tests/contrib/ecalproto/ecal_proto_test/src/protobuf/house.proto diff --git a/testing/contrib/ecalproto/ecal_proto_test/src/protobuf/person.proto b/tests/contrib/ecalproto/ecal_proto_test/src/protobuf/person.proto similarity index 100% rename from testing/contrib/ecalproto/ecal_proto_test/src/protobuf/person.proto rename to tests/contrib/ecalproto/ecal_proto_test/src/protobuf/person.proto diff --git a/testing/contrib/ecalproto/ecal_proto_test/src/test_filters.cpp b/tests/contrib/ecalproto/ecal_proto_test/src/test_filters.cpp similarity index 100% rename from testing/contrib/ecalproto/ecal_proto_test/src/test_filters.cpp rename to tests/contrib/ecalproto/ecal_proto_test/src/test_filters.cpp diff --git a/testing/contrib/ecalproto/ecal_proto_test/src/test_maximum_array_dimensions.cpp b/tests/contrib/ecalproto/ecal_proto_test/src/test_maximum_array_dimensions.cpp similarity index 100% rename from testing/contrib/ecalproto/ecal_proto_test/src/test_maximum_array_dimensions.cpp rename to tests/contrib/ecalproto/ecal_proto_test/src/test_maximum_array_dimensions.cpp diff --git a/testing/contrib/ecalproto/ecal_proto_test/src/test_proto_dyn_decoder.cpp b/tests/contrib/ecalproto/ecal_proto_test/src/test_proto_dyn_decoder.cpp similarity index 100% rename from testing/contrib/ecalproto/ecal_proto_test/src/test_proto_dyn_decoder.cpp rename to tests/contrib/ecalproto/ecal_proto_test/src/test_proto_dyn_decoder.cpp