Rename cmrc target "ui_assets"

Avoids clash with an opendigitizer target with the same name.
fair-acc · Jan 17, 2024 · 0b0fd54 · 0b0fd54
1 parent c889b38
commit 0b0fd54
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/blocklib/timing/CMakeLists.txt b/blocklib/timing/CMakeLists.txt
@@ -1,17 +1,17 @@
 if (NOT EMSCRIPTEN)
     cmrc_add_resource_library(
-            ui_assets
-            NAMESPACE
-            ui_assets
-            WHENCE
-            ${imgui_SOURCE_DIR}/misc/fonts
-            ${imgui_SOURCE_DIR}/misc/fonts/Roboto-Medium.ttf)
+        timing_ui_assets
+        NAMESPACE
+        timing_ui_assets
+        WHENCE
+        ${imgui_SOURCE_DIR}/misc/fonts
+        ${imgui_SOURCE_DIR}/misc/fonts/Roboto-Medium.ttf)
 
     add_library(timing INTERFACE)
     target_include_directories(timing INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include/)
 
     add_executable(test-timing src/test-timing.cpp)
-    target_link_libraries(test-timing PRIVATE gr-digitizers-options timing PkgConfig::saftlib PkgConfig::etherbone imgui implot gnuradio-algorithm gnuradio-core ui_assets)
+    target_link_libraries(test-timing PRIVATE gr-digitizers-options timing PkgConfig::saftlib PkgConfig::etherbone imgui implot gnuradio-algorithm gnuradio-core timing_ui_assets)
 endif ()
 
 if (ENABLE_GR_DIGITIZERS_TESTING)

diff --git a/blocklib/timing/src/fair_header.h b/blocklib/timing/src/fair_header.h
@@ -6,7 +6,7 @@
 #include <fmt/chrono.h>
 #include <string_view>
 
-CMRC_DECLARE(ui_assets);
+CMRC_DECLARE(timing_ui_assets);
 
 namespace app_header {
 namespace detail {
@@ -31,8 +31,8 @@ ImFont* loadHeaderFont(float size) {
     config.OversampleV          = 1;
     config.PixelSnapH           = true;
     config.FontDataOwnedByAtlas = false;
-    ImGuiIO   &io       = ImGui::GetIO();
-    auto primaryFont = cmrc::ui_assets::get_filesystem().open("Roboto-Medium.ttf");
+    ImGuiIO &io                 = ImGui::GetIO();
+    auto     primaryFont        = cmrc::timing_ui_assets::get_filesystem().open("Roboto-Medium.ttf");
     return io.Fonts->AddFontFromMemoryTTF(const_cast<char *>(primaryFont.begin()), static_cast<int>(primaryFont.size()), size, &config);
 }