Change version retrieving logic for mrtrix3 executables

The strategy now matches what we do to get the library version.
MRtrix3 · Oct 1, 2024 · 36f1ccc · 36f1ccc
1 parent 2c68665
commit 36f1ccc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/cpp/lib/core/app.cpp b/cpp/lib/core/app.cpp
@@ -116,7 +116,6 @@ const std::thread::id main_thread_ID = std::this_thread::get_id();
 
 const char *project_version = nullptr;
 const char *project_build_date = nullptr;
-const char *executable_uses_mrtrix_version = nullptr;
 
 std::vector<std::string> raw_arguments_list;
 
@@ -1153,9 +1152,9 @@ void init(int cmdline_argc, const char *const *cmdline_argv) {
     NAME.erase(NAME.size() - 4);
 #endif
 
-  if (mrtrix_version != executable_uses_mrtrix_version) {
+  if (mrtrix_version != mrtrix_executable_version) {
     Exception E("executable was compiled for a different version of the MRtrix3 library!");
-    E.push_back(std::string("  ") + NAME + " version: " + executable_uses_mrtrix_version);
+    E.push_back(std::string("  ") + NAME + " version: " + mrtrix_executable_version);
     E.push_back(std::string("  library version: ") + mrtrix_version);
     E.push_back("You may need to erase files left over from prior MRtrix3 versions;");
     E.push_back("eg. core/version.cpp; src/exec_version.cpp");

diff --git a/cpp/lib/core/command.h b/cpp/lib/core/command.h
@@ -36,7 +36,6 @@ void set_project_version();
 #ifdef MRTRIX_AS_R_LIBRARY
 
 extern "C" void R_main(int *cmdline_argc, char **cmdline_argv) {
-  ::MR::App::set_executable_uses_mrtrix_version();
 #ifdef MRTRIX_PROJECT
   ::MR::App::set_project_version();
 #endif
@@ -79,7 +78,6 @@ int main(int cmdline_argc, char **cmdline_argv) {
   mxcsr |= (1 << 6); // denormals-are-zero
   _mm_setcsr(mxcsr);
 #endif
-  ::MR::App::set_executable_uses_mrtrix_version();
 #ifdef MRTRIX_PROJECT
   ::MR::App::set_project_version();
 #endif

diff --git a/cpp/lib/executable_version.cpp.in b/cpp/lib/executable_version.cpp.in
@@ -1,8 +1,5 @@
 #include "executable_version.h"
 
-namespace MR {
-  namespace App {
-    extern const char* executable_uses_mrtrix_version;
-    void set_executable_uses_mrtrix_version () { executable_uses_mrtrix_version = "@MRTRIX_VERSION@"; }
-  }
+namespace MR::App {
+const std::string mrtrix_executable_version = "@MRTRIX_VERSION@";
 }
diff --git a/cpp/lib/executable_version.h b/cpp/lib/executable_version.h
@@ -15,7 +15,8 @@
  */
 
 #pragma once
+#include <string>
 
 namespace MR::App {
-void set_executable_uses_mrtrix_version();
-}
+extern const std::string mrtrix_executable_version;
+} // namespace MR::App