Merge pull request #49 from skunkforce/dp/version_info

added cmake version info and git hash.
skunkforce · Oct 25, 2023 · d895316 · d895316
2 parents 9f75f0b + 6e82236
commit d895316
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES CMAKE_PROJECT_TOP_LEVEL_INCLUDE
 
 set(CMAKE_TOOLCHAIN_FILE "${vcpkg_SOURCE_DIR}/scripts/buildsystems/vcpkg.cmake")
 
-project("OmniscopeGui")
+project("OmniscopeGui" VERSION 0.5.1)
 
 if(MSVC)
     add_compile_options(
@@ -27,11 +27,18 @@ endif()
 
 
 include(cmake_helpers/BuildOptions.cmake)
+include(cmake_helpers/FindOrFetch.cmake)
 
 add_executable(OmniView src/main.cpp)
 
 target_add_default_build_options(OmniView PUBLIC)
 
+find_or_fetch_package(
+  cmake_git_version 0.1 GIT_REPOSITORY
+  https://github.com/dominicpoeschko/cmake_git_version.git GIT_TAG master)
+
+target_add_version_headers(OmniView ${CMAKE_BUILD_TYPE})
+
 add_subdirectory(ImGuiInstance)
 target_link_libraries(OmniView PUBLIC imgui_instance::imgui_instance)
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -20,6 +20,7 @@
 #include <nlohmann/json_fwd.hpp>
 #include <set>
 #include <thread>
+#include <cmake_git_version/version.hpp>
 // clang-format off
 #include <imfilebrowser.h>
 // clang-format on
@@ -348,6 +349,11 @@ int main() {
         captureData.clear();
         flagPaused = true;
       }
+
+      if (ImGui::MenuItem(
+              fmt::format("Version: {}", CMakeGitVersion::VersionWithGit)
+                  .c_str())) {
+      }
       ImGui::EndMenu();
     }
     /*
@@ -676,8 +682,12 @@ int main() {
     ImGui::PopStyleColor(7);
   };
 
-  ImGuiInstance window{1920, 1080, load_json<std::string>(config, "title")};
+  ImGuiInstance window{1920, 1080,
+        fmt::format("{} {}",
+                      CMakeGitVersion::Target::Name
+                    , CMakeGitVersion::Project::Version)};
+
   while (window.run(render)) {
   }
   return 0;
-}
+}