[samples/tests] folder structure cleaned up (#1445)

* testing renamed to tests ecal core samples and ecal core tests aligned to the same project property folders samples and tests
eclipse-ecal · Mar 11, 2024 · 84fae8f · 84fae8f
1 parent 3092e1b
commit 84fae8f
Show file tree

Hide file tree

Showing 98 changed files with 82 additions and 82 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}