[meta] Move metadata file into a subfolder

Author: IAmNotHanni

benchmarks/engine_benchmark_main.cpp

@@ -1,11 +1,11 @@
 #include <benchmark/benchmark.h>
 
-#include "inexor/vulkan-renderer/meta.hpp"
+#include "inexor/vulkan-renderer/meta/meta.hpp"
 
 #include <iostream>
 
 int main(int argc, char **argv) {
-    using namespace inexor::vulkan_renderer;
+    using namespace inexor::vulkan_renderer::meta;
 
     // Print engine and application metadata.
     std::cout << ENGINE_NAME << ", version " << ENGINE_VERSION_STR << std::endl;

include/inexor/vulkan-renderer/meta.hpp.in renamed to include/inexor/vulkan-renderer/meta/meta.hpp.in

@@ -2,7 +2,7 @@
 
 #include <array>
 
-namespace inexor::vulkan_renderer {
+namespace inexor::vulkan_renderer::meta {
 
 /// The following data will be replaced by CMake setup.
 constexpr const char *APP_NAME{"${INEXOR_APP_NAME}"};

src/CMakeLists.txt

@@ -101,8 +101,8 @@ endif()
 
 # Replace variables in header file with CMake values
 configure_file(
-    ${PROJECT_SOURCE_DIR}/include/inexor/vulkan-renderer/meta.hpp.in
-    ${CMAKE_CURRENT_BINARY_DIR}/include/inexor/vulkan-renderer/meta.hpp
+    ${PROJECT_SOURCE_DIR}/include/inexor/vulkan-renderer/meta/meta.hpp.in
+    ${CMAKE_CURRENT_BINARY_DIR}/include/inexor/vulkan-renderer/meta/meta.hpp
 )
 
 target_include_directories(

src/vulkan-renderer/application.cpp

@@ -1,7 +1,7 @@
 #include "inexor/vulkan-renderer/application.hpp"
 
 #include "inexor/vulkan-renderer/exception.hpp"
-#include "inexor/vulkan-renderer/meta.hpp"
+#include "inexor/vulkan-renderer/meta/meta.hpp"
 #include "inexor/vulkan-renderer/octree_gpu_vertex.hpp"
 #include "inexor/vulkan-renderer/standard_ubo.hpp"
 #include "inexor/vulkan-renderer/tools/camera.hpp"
@@ -286,7 +286,7 @@ void Application::initialize_spdlog() {
     auto console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
 
     // A copy of the console output will automatically be saved to a logfile
-    auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(std::string(APP_NAME) + ".log", true);
+    auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(std::string(meta::APP_NAME) + ".log", true);
     auto logger = std::make_shared<spdlog::async_logger>("main", spdlog::sinks_init_list{console_sink, file_sink},
                                                          spdlog::thread_pool(), spdlog::async_overflow_policy::block);
 
@@ -303,6 +303,8 @@ void Application::initialize_spdlog() {
 Application::Application(int argc, char **argv) {
     initialize_spdlog();
 
+    using namespace vulkan_renderer::meta;
+
     spdlog::trace("Application version: {}.{}.{}", APP_VERSION[0], APP_VERSION[1], APP_VERSION[2]);
     spdlog::trace("Engine version: {}.{}.{}", ENGINE_VERSION[0], ENGINE_VERSION[1], ENGINE_VERSION[2]);
 
@@ -492,7 +494,8 @@ void Application::update_imgui_overlay() {
     ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0);
     ImGui::SetNextWindowPos(ImVec2(10, 10));
     ImGui::SetNextWindowSize(ImVec2(330, 0));
-    ImGui::Begin("Inexor Vulkan-renderer", nullptr,
+    using namespace vulkan_renderer::meta;
+    ImGui::Begin(APP_NAME, nullptr,
                  ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove);
     ImGui::Text("%s", m_device->gpu_name().c_str());
     ImGui::Text("Engine version %d.%d.%d (Git sha %s)", ENGINE_VERSION[0], ENGINE_VERSION[1], ENGINE_VERSION[2],

tests/unit_tests_main.cpp

@@ -1,11 +1,11 @@
 #include <gtest/gtest.h>
 
-#include "inexor/vulkan-renderer/meta.hpp"
+#include "inexor/vulkan-renderer/meta/meta.hpp"
 
 #include <iostream>
 
 int main(int argc, char **argv) {
-    using namespace inexor::vulkan_renderer;
+    using namespace inexor::vulkan_renderer::meta;
 
     // Print engine and application metadata.
     std::cout << ENGINE_NAME << ", version " << ENGINE_VERSION_STR << std::endl;