feat cmake: use namespace when calling utils::RegisterResource

zmij · apolukhin · commit 582368abeaa0 · 2025-09-03T10:31:59.000+03:00
Tests: протестировано CI Pull Request resolved: #1017 commit_hash:7e71508a4eb3b4d18886cfca7aa061d7185c790f
diff --git a/cmake/embedded_config.cmake b/cmake/embedded_config.cmake
@@ -1,6 +1,6 @@
 cmake_policy(SET CMP0053 NEW)
 
-set(NAMESPACE userver)
+set(NAMESPACE USERVER_NAMESPACE)
 set(FILE_IN ${CMAKE_CURRENT_BINARY_DIR}/embedded.h.in)
 set(TEMPLATE
     "
@@ -44,7 +44,7 @@ extern \"C\" const int @NAME@_size;
 
 
 __attribute__((constructor)) void @NAME@_call() {
-  utils::RegisterResource(\"@NAME@\", std::string_view{@NAME@_begin, static_cast<size_t>(@NAME@_size)});
+  ${NAMESPACE}::utils::RegisterResource(\"@NAME@\", std::string_view{@NAME@_begin, static_cast<size_t>(@NAME@_size)});
 }
 "
 )

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`cmake_policy(SET CMP0053 NEW)`
`2`	`2`
`3`		`-set(NAMESPACE userver)`
	`3`	`+set(NAMESPACE USERVER_NAMESPACE)`
`4`	`4`	`set(FILE_IN ${CMAKE_CURRENT_BINARY_DIR}/embedded.h.in)`
`5`	`5`	`set(TEMPLATE`
`6`	`6`	`"`
`@@ -44,7 +44,7 @@ extern \"C\" const int @NAME@_size;`
`44`	`44`
`45`	`45`
`46`	`46`	`__attribute__((constructor)) void @NAME@_call() {`
`47`		`- utils::RegisterResource(\"@NAME@\", std::string_view{@NAME@_begin, static_cast<size_t>(@NAME@_size)});`
	`47`	`+ ${NAMESPACE}::utils::RegisterResource(\"@NAME@\", std::string_view{@NAME@_begin, static_cast<size_t>(@NAME@_size)});`
`48`	`48`	`}`
`49`	`49`	`"`
`50`	`50`	`)`