diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 22f0b515e8..ad8b6312be 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -33,6 +33,18 @@ add_subdirectory(cpp/measurement/measurement_read)
 add_subdirectory(cpp/measurement/measurement_write)
 endif(HAS_HDF5)
 
+if (HAS_CAPNPROTO)
+add_subdirectory(cpp/pubsub/capnp/addressbook_rec)
+add_subdirectory(cpp/pubsub/capnp/addressbook_rec_cb)
+add_subdirectory(cpp/pubsub/capnp/addressbook_rec_dynamic)
+add_subdirectory(cpp/pubsub/capnp/addressbook_snd)
+endif(HAS_CAPNPROTO)
+
+if (HAS_FLATBUFFERS)
+add_subdirectory(cpp/pubsub/flatbuffer/monster_rec)
+add_subdirectory(cpp/pubsub/flatbuffer/monster_snd)
+endif(HAS_FLATBUFFERS)
+
 # services
 add_subdirectory(cpp/services/ecalplayer_client)
 if(HAS_QT)
diff --git a/samples/cpp/pubsub/capnp/addressbook_rec/CMakeLists.txt b/samples/cpp/pubsub/capnp/addressbook_rec/CMakeLists.txt
index bc91ac896c..28cf9e8dfd 100644
--- a/samples/cpp/pubsub/capnp/addressbook_rec/CMakeLists.txt
+++ b/samples/cpp/pubsub/capnp/addressbook_rec/CMakeLists.txt
@@ -38,4 +38,4 @@ target_link_options(${PROJECT_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/ignore:40
 
 ecal_install_sample(${PROJECT_NAME})
 
-set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/capnp/addressbook)
+set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/capnproto)
diff --git a/samples/cpp/pubsub/capnp/addressbook_rec_cb/CMakeLists.txt b/samples/cpp/pubsub/capnp/addressbook_rec_cb/CMakeLists.txt
index 8b6ec95a6f..7719484ef9 100644
--- a/samples/cpp/pubsub/capnp/addressbook_rec_cb/CMakeLists.txt
+++ b/samples/cpp/pubsub/capnp/addressbook_rec_cb/CMakeLists.txt
@@ -38,4 +38,4 @@ target_link_options(${PROJECT_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/ignore:40
 
 ecal_install_sample(${PROJECT_NAME})
 
-set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/capnp/addressbook)
\ No newline at end of file
+set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/capnproto)
\ No newline at end of file
diff --git a/samples/cpp/pubsub/capnp/addressbook_rec_dynamic/CMakeLists.txt b/samples/cpp/pubsub/capnp/addressbook_rec_dynamic/CMakeLists.txt
index 0af1ddd0e7..cdb1817eeb 100644
--- a/samples/cpp/pubsub/capnp/addressbook_rec_dynamic/CMakeLists.txt
+++ b/samples/cpp/pubsub/capnp/addressbook_rec_dynamic/CMakeLists.txt
@@ -34,4 +34,4 @@ target_link_options(${PROJECT_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/ignore:40
 
 ecal_install_sample(${PROJECT_NAME})
 
-set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/capnp/addressbook)
+set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/capnproto)
diff --git a/samples/cpp/pubsub/capnp/addressbook_snd/CMakeLists.txt b/samples/cpp/pubsub/capnp/addressbook_snd/CMakeLists.txt
index af7f523293..89a7571036 100644
--- a/samples/cpp/pubsub/capnp/addressbook_snd/CMakeLists.txt
+++ b/samples/cpp/pubsub/capnp/addressbook_snd/CMakeLists.txt
@@ -38,4 +38,4 @@ target_link_options(${PROJECT_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/ignore:40
 
 ecal_install_sample(${PROJECT_NAME})
 
-set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/capnp/addressbook)
+set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/capnproto)
diff --git a/samples/cpp/pubsub/flatbuffer/monster_rec/CMakeLists.txt b/samples/cpp/pubsub/flatbuffer/monster_rec/CMakeLists.txt
index 1501355991..65f7e5d1f5 100644
--- a/samples/cpp/pubsub/flatbuffer/monster_rec/CMakeLists.txt
+++ b/samples/cpp/pubsub/flatbuffer/monster_rec/CMakeLists.txt
@@ -45,4 +45,4 @@ target_link_libraries(${PROJECT_NAME}
 
 ecal_install_sample(${PROJECT_NAME})
 
-set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/monster)
\ No newline at end of file
+set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/flatbuffers)
\ No newline at end of file
diff --git a/samples/cpp/pubsub/flatbuffer/monster_snd/CMakeLists.txt b/samples/cpp/pubsub/flatbuffer/monster_snd/CMakeLists.txt
index 8e61aec451..cde6831471 100644
--- a/samples/cpp/pubsub/flatbuffer/monster_snd/CMakeLists.txt
+++ b/samples/cpp/pubsub/flatbuffer/monster_snd/CMakeLists.txt
@@ -45,4 +45,4 @@ target_link_libraries(${PROJECT_NAME}
 
 ecal_install_sample(${PROJECT_NAME})
 
-set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/monster)
\ No newline at end of file
+set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/cpp/pubsub/flatbuffers)
\ No newline at end of file