Intermediate changes

24 files changed, 180 insertions, 180 deletions

diff --git a/library/cpp/messagebus/CMakeLists.darwin.txt b/library/cpp/messagebus/CMakeLists.darwin.txt
index af2b7a2008..04054d20b8 100644
--- a/library/cpp/messagebus/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/CMakeLists.darwin.txt
@@ -32,40 +32,40 @@ target_link_libraries(library-cpp-messagebus PUBLIC
   cpp-deprecated-atomic
 )
 target_sources(library-cpp-messagebus PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/acceptor.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/acceptor_status.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/connection.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/coreconn.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/duration_histogram.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/event_loop.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/futex_like.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/handler.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/key_value_printer.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/local_flags.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/locator.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/mb_lwtrace.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message_counter.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message_status.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message_status_counter.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/messqueue.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/network.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/queue_config.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_client_connection.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_client_session.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_client_session_semaphore.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_connection.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_connection_status.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_server_connection.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_server_session.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_server_session_semaphore.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/session.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/session_impl.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/session_job_count.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/shutdown_state.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/socket_addr.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/storage.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/synchandler.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/use_after_free_checker.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/use_count_checker.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/acceptor.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/acceptor_status.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/connection.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/coreconn.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/duration_histogram.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/event_loop.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/futex_like.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/handler.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/key_value_printer.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/local_flags.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/locator.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/mb_lwtrace.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message_counter.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message_status.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message_status_counter.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/messqueue.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/network.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/queue_config.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_client_connection.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_client_session.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_client_session_semaphore.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_connection.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_connection_status.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_server_connection.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_server_session.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_server_session_semaphore.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/session.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/session_impl.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/session_job_count.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/shutdown_state.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/socket_addr.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/storage.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/synchandler.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/use_after_free_checker.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/use_count_checker.cpp
 )
diff --git a/library/cpp/messagebus/CMakeLists.linux-aarch64.txt b/library/cpp/messagebus/CMakeLists.linux-aarch64.txt
index e27549d923..f6dbfe4dd5 100644
--- a/library/cpp/messagebus/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/messagebus/CMakeLists.linux-aarch64.txt
@@ -33,40 +33,40 @@ target_link_libraries(library-cpp-messagebus PUBLIC
   cpp-deprecated-atomic
 )
 target_sources(library-cpp-messagebus PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/acceptor.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/acceptor_status.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/connection.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/coreconn.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/duration_histogram.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/event_loop.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/futex_like.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/handler.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/key_value_printer.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/local_flags.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/locator.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/mb_lwtrace.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message_counter.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message_status.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message_status_counter.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/messqueue.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/network.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/queue_config.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_client_connection.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_client_session.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_client_session_semaphore.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_connection.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_connection_status.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_server_connection.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_server_session.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_server_session_semaphore.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/session.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/session_impl.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/session_job_count.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/shutdown_state.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/socket_addr.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/storage.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/synchandler.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/use_after_free_checker.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/use_count_checker.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/acceptor.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/acceptor_status.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/connection.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/coreconn.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/duration_histogram.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/event_loop.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/futex_like.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/handler.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/key_value_printer.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/local_flags.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/locator.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/mb_lwtrace.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message_counter.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message_status.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message_status_counter.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/messqueue.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/network.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/queue_config.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_client_connection.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_client_session.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_client_session_semaphore.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_connection.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_connection_status.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_server_connection.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_server_session.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_server_session_semaphore.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/session.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/session_impl.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/session_job_count.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/shutdown_state.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/socket_addr.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/storage.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/synchandler.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/use_after_free_checker.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/use_count_checker.cpp
 )
diff --git a/library/cpp/messagebus/CMakeLists.linux.txt b/library/cpp/messagebus/CMakeLists.linux.txt
index e27549d923..f6dbfe4dd5 100644
--- a/library/cpp/messagebus/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/CMakeLists.linux.txt
@@ -33,40 +33,40 @@ target_link_libraries(library-cpp-messagebus PUBLIC
   cpp-deprecated-atomic
 )
 target_sources(library-cpp-messagebus PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/acceptor.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/acceptor_status.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/connection.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/coreconn.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/duration_histogram.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/event_loop.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/futex_like.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/handler.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/key_value_printer.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/local_flags.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/locator.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/mb_lwtrace.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message_counter.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message_status.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message_status_counter.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/messqueue.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/network.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/queue_config.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_client_connection.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_client_session.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_client_session_semaphore.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_connection.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_connection_status.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_server_connection.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_server_session.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_server_session_semaphore.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/session.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/session_impl.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/session_job_count.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/shutdown_state.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/socket_addr.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/storage.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/synchandler.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/use_after_free_checker.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/use_count_checker.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/acceptor.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/acceptor_status.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/connection.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/coreconn.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/duration_histogram.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/event_loop.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/futex_like.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/handler.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/key_value_printer.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/local_flags.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/locator.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/mb_lwtrace.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message_counter.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message_status.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/message_status_counter.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/messqueue.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/network.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/queue_config.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_client_connection.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_client_session.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_client_session_semaphore.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_connection.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_connection_status.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_server_connection.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_server_session.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/remote_server_session_semaphore.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/session.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/session_impl.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/session_job_count.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/shutdown_state.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/socket_addr.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/storage.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/synchandler.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/use_after_free_checker.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/use_count_checker.cpp
 )
diff --git a/library/cpp/messagebus/actor/CMakeLists.darwin.txt b/library/cpp/messagebus/actor/CMakeLists.darwin.txt
index da26bb12a8..e9626ab9dd 100644
--- a/library/cpp/messagebus/actor/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/actor/CMakeLists.darwin.txt
@@ -14,7 +14,7 @@ target_link_libraries(messagebus_actor PUBLIC
   cpp-deprecated-atomic
 )
 target_sources(messagebus_actor PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/actor/executor.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/actor/thread_extra.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/actor/what_thread_does.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/actor/executor.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/actor/thread_extra.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/actor/what_thread_does.cpp
 )
diff --git a/library/cpp/messagebus/actor/CMakeLists.linux-aarch64.txt b/library/cpp/messagebus/actor/CMakeLists.linux-aarch64.txt
index c14195e952..5764f06377 100644
--- a/library/cpp/messagebus/actor/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/messagebus/actor/CMakeLists.linux-aarch64.txt
@@ -15,7 +15,7 @@ target_link_libraries(messagebus_actor PUBLIC
   cpp-deprecated-atomic
 )
 target_sources(messagebus_actor PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/actor/executor.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/actor/thread_extra.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/actor/what_thread_does.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/actor/executor.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/actor/thread_extra.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/actor/what_thread_does.cpp
 )
diff --git a/library/cpp/messagebus/actor/CMakeLists.linux.txt b/library/cpp/messagebus/actor/CMakeLists.linux.txt
index c14195e952..5764f06377 100644
--- a/library/cpp/messagebus/actor/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/actor/CMakeLists.linux.txt
@@ -15,7 +15,7 @@ target_link_libraries(messagebus_actor PUBLIC
   cpp-deprecated-atomic
 )
 target_sources(messagebus_actor PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/actor/executor.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/actor/thread_extra.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/actor/what_thread_does.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/actor/executor.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/actor/thread_extra.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/actor/what_thread_does.cpp
 )
diff --git a/library/cpp/messagebus/config/CMakeLists.darwin.txt b/library/cpp/messagebus/config/CMakeLists.darwin.txt
index 2ac52c60e8..f14949f35c 100644
--- a/library/cpp/messagebus/config/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/config/CMakeLists.darwin.txt
@@ -15,6 +15,6 @@ target_link_libraries(cpp-messagebus-config PUBLIC
   cpp-deprecated-enum_codegen
 )
 target_sources(cpp-messagebus-config PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/config/netaddr.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/config/session_config.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/config/netaddr.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/config/session_config.cpp
 )
diff --git a/library/cpp/messagebus/config/CMakeLists.linux-aarch64.txt b/library/cpp/messagebus/config/CMakeLists.linux-aarch64.txt
index 0414cabc63..9e0ad4a46c 100644
--- a/library/cpp/messagebus/config/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/messagebus/config/CMakeLists.linux-aarch64.txt
@@ -16,6 +16,6 @@ target_link_libraries(cpp-messagebus-config PUBLIC
   cpp-deprecated-enum_codegen
 )
 target_sources(cpp-messagebus-config PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/config/netaddr.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/config/session_config.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/config/netaddr.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/config/session_config.cpp
 )
diff --git a/library/cpp/messagebus/config/CMakeLists.linux.txt b/library/cpp/messagebus/config/CMakeLists.linux.txt
index 0414cabc63..9e0ad4a46c 100644
--- a/library/cpp/messagebus/config/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/config/CMakeLists.linux.txt
@@ -16,6 +16,6 @@ target_link_libraries(cpp-messagebus-config PUBLIC
   cpp-deprecated-enum_codegen
 )
 target_sources(cpp-messagebus-config PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/config/netaddr.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/config/session_config.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/config/netaddr.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/config/session_config.cpp
 )
diff --git a/library/cpp/messagebus/monitoring/CMakeLists.darwin.txt b/library/cpp/messagebus/monitoring/CMakeLists.darwin.txt
index 8b0e392fbc..715672a0bb 100644
--- a/library/cpp/messagebus/monitoring/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/monitoring/CMakeLists.darwin.txt
@@ -15,18 +15,18 @@ target_link_libraries(cpp-messagebus-monitoring PUBLIC
   contrib-libs-protobuf
 )
 target_proto_messages(cpp-messagebus-monitoring PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/monitoring/mon_proto.proto
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/monitoring/mon_proto.proto
 )
 target_proto_addincls(cpp-messagebus-monitoring
   ./
-  ${CMAKE_SOURCE_DIR}/
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  \${CMAKE_SOURCE_DIR}/
+  \${CMAKE_BINARY_DIR}
+  \${CMAKE_SOURCE_DIR}
+  \${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  \${CMAKE_BINARY_DIR}
+  \${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
 )
 target_proto_outs(cpp-messagebus-monitoring
-  --cpp_out=${CMAKE_BINARY_DIR}/
-  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+  --cpp_out=\${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=\${CMAKE_BINARY_DIR}/
 )
diff --git a/library/cpp/messagebus/monitoring/CMakeLists.linux-aarch64.txt b/library/cpp/messagebus/monitoring/CMakeLists.linux-aarch64.txt
index 38b1aa98a3..566852313a 100644
--- a/library/cpp/messagebus/monitoring/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/messagebus/monitoring/CMakeLists.linux-aarch64.txt
@@ -16,18 +16,18 @@ target_link_libraries(cpp-messagebus-monitoring PUBLIC
   contrib-libs-protobuf
 )
 target_proto_messages(cpp-messagebus-monitoring PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/monitoring/mon_proto.proto
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/monitoring/mon_proto.proto
 )
 target_proto_addincls(cpp-messagebus-monitoring
   ./
-  ${CMAKE_SOURCE_DIR}/
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  \${CMAKE_SOURCE_DIR}/
+  \${CMAKE_BINARY_DIR}
+  \${CMAKE_SOURCE_DIR}
+  \${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  \${CMAKE_BINARY_DIR}
+  \${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
 )
 target_proto_outs(cpp-messagebus-monitoring
-  --cpp_out=${CMAKE_BINARY_DIR}/
-  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+  --cpp_out=\${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=\${CMAKE_BINARY_DIR}/
 )
diff --git a/library/cpp/messagebus/monitoring/CMakeLists.linux.txt b/library/cpp/messagebus/monitoring/CMakeLists.linux.txt
index 38b1aa98a3..566852313a 100644
--- a/library/cpp/messagebus/monitoring/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/monitoring/CMakeLists.linux.txt
@@ -16,18 +16,18 @@ target_link_libraries(cpp-messagebus-monitoring PUBLIC
   contrib-libs-protobuf
 )
 target_proto_messages(cpp-messagebus-monitoring PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/monitoring/mon_proto.proto
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/monitoring/mon_proto.proto
 )
 target_proto_addincls(cpp-messagebus-monitoring
   ./
-  ${CMAKE_SOURCE_DIR}/
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  \${CMAKE_SOURCE_DIR}/
+  \${CMAKE_BINARY_DIR}
+  \${CMAKE_SOURCE_DIR}
+  \${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  \${CMAKE_BINARY_DIR}
+  \${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
 )
 target_proto_outs(cpp-messagebus-monitoring
-  --cpp_out=${CMAKE_BINARY_DIR}/
-  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+  --cpp_out=\${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=\${CMAKE_BINARY_DIR}/
 )
diff --git a/library/cpp/messagebus/oldmodule/CMakeLists.darwin.txt b/library/cpp/messagebus/oldmodule/CMakeLists.darwin.txt
index 11b6ead04d..04c6aee278 100644
--- a/library/cpp/messagebus/oldmodule/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/oldmodule/CMakeLists.darwin.txt
@@ -15,6 +15,6 @@ target_link_libraries(cpp-messagebus-oldmodule PUBLIC
   messagebus_actor
 )
 target_sources(cpp-messagebus-oldmodule PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/oldmodule/module.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/oldmodule/startsession.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/oldmodule/module.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/oldmodule/startsession.cpp
 )
diff --git a/library/cpp/messagebus/oldmodule/CMakeLists.linux-aarch64.txt b/library/cpp/messagebus/oldmodule/CMakeLists.linux-aarch64.txt
index 8e3de5c67f..75ebf92d61 100644
--- a/library/cpp/messagebus/oldmodule/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/messagebus/oldmodule/CMakeLists.linux-aarch64.txt
@@ -16,6 +16,6 @@ target_link_libraries(cpp-messagebus-oldmodule PUBLIC
   messagebus_actor
 )
 target_sources(cpp-messagebus-oldmodule PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/oldmodule/module.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/oldmodule/startsession.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/oldmodule/module.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/oldmodule/startsession.cpp
 )
diff --git a/library/cpp/messagebus/oldmodule/CMakeLists.linux.txt b/library/cpp/messagebus/oldmodule/CMakeLists.linux.txt
index 8e3de5c67f..75ebf92d61 100644
--- a/library/cpp/messagebus/oldmodule/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/oldmodule/CMakeLists.linux.txt
@@ -16,6 +16,6 @@ target_link_libraries(cpp-messagebus-oldmodule PUBLIC
   messagebus_actor
 )
 target_sources(cpp-messagebus-oldmodule PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/oldmodule/module.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/oldmodule/startsession.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/oldmodule/module.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/oldmodule/startsession.cpp
 )
diff --git a/library/cpp/messagebus/protobuf/CMakeLists.darwin.txt b/library/cpp/messagebus/protobuf/CMakeLists.darwin.txt
index 8566a4b7ef..a2e50060a0 100644
--- a/library/cpp/messagebus/protobuf/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/protobuf/CMakeLists.darwin.txt
@@ -16,5 +16,5 @@ target_link_libraries(messagebus_protobuf PUBLIC
   messagebus_actor
 )
 target_sources(messagebus_protobuf PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/protobuf/ybusbuf.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/protobuf/ybusbuf.cpp
 )
diff --git a/library/cpp/messagebus/protobuf/CMakeLists.linux-aarch64.txt b/library/cpp/messagebus/protobuf/CMakeLists.linux-aarch64.txt
index e235083392..784465d025 100644
--- a/library/cpp/messagebus/protobuf/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/messagebus/protobuf/CMakeLists.linux-aarch64.txt
@@ -17,5 +17,5 @@ target_link_libraries(messagebus_protobuf PUBLIC
   messagebus_actor
 )
 target_sources(messagebus_protobuf PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/protobuf/ybusbuf.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/protobuf/ybusbuf.cpp
 )
diff --git a/library/cpp/messagebus/protobuf/CMakeLists.linux.txt b/library/cpp/messagebus/protobuf/CMakeLists.linux.txt
index e235083392..784465d025 100644
--- a/library/cpp/messagebus/protobuf/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/protobuf/CMakeLists.linux.txt
@@ -17,5 +17,5 @@ target_link_libraries(messagebus_protobuf PUBLIC
   messagebus_actor
 )
 target_sources(messagebus_protobuf PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/protobuf/ybusbuf.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/protobuf/ybusbuf.cpp
 )
diff --git a/library/cpp/messagebus/scheduler/CMakeLists.darwin.txt b/library/cpp/messagebus/scheduler/CMakeLists.darwin.txt
index 510bc01bd5..9dcbd69ead 100644
--- a/library/cpp/messagebus/scheduler/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/scheduler/CMakeLists.darwin.txt
@@ -15,5 +15,5 @@ target_link_libraries(cpp-messagebus-scheduler PUBLIC
   cpp-deprecated-atomic
 )
 target_sources(cpp-messagebus-scheduler PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/scheduler/scheduler.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/scheduler/scheduler.cpp
 )
diff --git a/library/cpp/messagebus/scheduler/CMakeLists.linux-aarch64.txt b/library/cpp/messagebus/scheduler/CMakeLists.linux-aarch64.txt
index 51187c45a4..d9807536f3 100644
--- a/library/cpp/messagebus/scheduler/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/messagebus/scheduler/CMakeLists.linux-aarch64.txt
@@ -16,5 +16,5 @@ target_link_libraries(cpp-messagebus-scheduler PUBLIC
   cpp-deprecated-atomic
 )
 target_sources(cpp-messagebus-scheduler PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/scheduler/scheduler.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/scheduler/scheduler.cpp
 )
diff --git a/library/cpp/messagebus/scheduler/CMakeLists.linux.txt b/library/cpp/messagebus/scheduler/CMakeLists.linux.txt
index 51187c45a4..d9807536f3 100644
--- a/library/cpp/messagebus/scheduler/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/scheduler/CMakeLists.linux.txt
@@ -16,5 +16,5 @@ target_link_libraries(cpp-messagebus-scheduler PUBLIC
   cpp-deprecated-atomic
 )
 target_sources(cpp-messagebus-scheduler PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/scheduler/scheduler.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/scheduler/scheduler.cpp
 )
diff --git a/library/cpp/messagebus/www/CMakeLists.darwin.txt b/library/cpp/messagebus/www/CMakeLists.darwin.txt
index 5a8c62b635..6beffff659 100644
--- a/library/cpp/messagebus/www/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/www/CMakeLists.darwin.txt
@@ -23,8 +23,8 @@ target_link_libraries(cpp-messagebus-www PUBLIC
   library-cpp-uri
 )
 target_sources(cpp-messagebus-www PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/html_output.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/www.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/html_output.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/www.cpp
 )
 
 add_global_library_for(cpp-messagebus-www.global cpp-messagebus-www)
@@ -43,13 +43,13 @@ target_link_libraries(cpp-messagebus-www.global PUBLIC
   library-cpp-uri
 )
 target_sources(cpp-messagebus-www.global PRIVATE
-  ${CMAKE_BINARY_DIR}/library/cpp/messagebus/www/dd5bbfe173cb40020e73f3227e3ac73d.cpp
+  \${CMAKE_BINARY_DIR}/library/cpp/messagebus/www/dd5bbfe173cb40020e73f3227e3ac73d.cpp
 )
 resources(cpp-messagebus-www.global
-  ${CMAKE_BINARY_DIR}/library/cpp/messagebus/www/dd5bbfe173cb40020e73f3227e3ac73d.cpp
+  \${CMAKE_BINARY_DIR}/library/cpp/messagebus/www/dd5bbfe173cb40020e73f3227e3ac73d.cpp
   INPUTS
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/messagebus.js
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/bus-ico.png
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/messagebus.js
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/bus-ico.png
   KEYS
   /messagebus.js
   /bus-ico.png
diff --git a/library/cpp/messagebus/www/CMakeLists.linux-aarch64.txt b/library/cpp/messagebus/www/CMakeLists.linux-aarch64.txt
index 0776cd5561..8605d60344 100644
--- a/library/cpp/messagebus/www/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/messagebus/www/CMakeLists.linux-aarch64.txt
@@ -24,8 +24,8 @@ target_link_libraries(cpp-messagebus-www PUBLIC
   library-cpp-uri
 )
 target_sources(cpp-messagebus-www PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/html_output.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/www.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/html_output.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/www.cpp
 )
 
 add_global_library_for(cpp-messagebus-www.global cpp-messagebus-www)
@@ -45,13 +45,13 @@ target_link_libraries(cpp-messagebus-www.global PUBLIC
   library-cpp-uri
 )
 target_sources(cpp-messagebus-www.global PRIVATE
-  ${CMAKE_BINARY_DIR}/library/cpp/messagebus/www/dd5bbfe173cb40020e73f3227e3ac73d.cpp
+  \${CMAKE_BINARY_DIR}/library/cpp/messagebus/www/dd5bbfe173cb40020e73f3227e3ac73d.cpp
 )
 resources(cpp-messagebus-www.global
-  ${CMAKE_BINARY_DIR}/library/cpp/messagebus/www/dd5bbfe173cb40020e73f3227e3ac73d.cpp
+  \${CMAKE_BINARY_DIR}/library/cpp/messagebus/www/dd5bbfe173cb40020e73f3227e3ac73d.cpp
   INPUTS
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/messagebus.js
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/bus-ico.png
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/messagebus.js
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/bus-ico.png
   KEYS
   /messagebus.js
   /bus-ico.png
diff --git a/library/cpp/messagebus/www/CMakeLists.linux.txt b/library/cpp/messagebus/www/CMakeLists.linux.txt
index 0776cd5561..8605d60344 100644
--- a/library/cpp/messagebus/www/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/www/CMakeLists.linux.txt
@@ -24,8 +24,8 @@ target_link_libraries(cpp-messagebus-www PUBLIC
   library-cpp-uri
 )
 target_sources(cpp-messagebus-www PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/html_output.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/www.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/html_output.cpp
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/www.cpp
 )
 
 add_global_library_for(cpp-messagebus-www.global cpp-messagebus-www)
@@ -45,13 +45,13 @@ target_link_libraries(cpp-messagebus-www.global PUBLIC
   library-cpp-uri
 )
 target_sources(cpp-messagebus-www.global PRIVATE
-  ${CMAKE_BINARY_DIR}/library/cpp/messagebus/www/dd5bbfe173cb40020e73f3227e3ac73d.cpp
+  \${CMAKE_BINARY_DIR}/library/cpp/messagebus/www/dd5bbfe173cb40020e73f3227e3ac73d.cpp
 )
 resources(cpp-messagebus-www.global
-  ${CMAKE_BINARY_DIR}/library/cpp/messagebus/www/dd5bbfe173cb40020e73f3227e3ac73d.cpp
+  \${CMAKE_BINARY_DIR}/library/cpp/messagebus/www/dd5bbfe173cb40020e73f3227e3ac73d.cpp
   INPUTS
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/messagebus.js
-  ${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/bus-ico.png
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/messagebus.js
+  \${CMAKE_SOURCE_DIR}/library/cpp/messagebus/www/bus-ico.png
   KEYS
   /messagebus.js
   /bus-ico.png