Fix version printing (#112)

cocos · Aug 30, 2023 · d4e9306 · d4e9306
1 parent ced72e8
commit d4e9306
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/Cli/CMakeLists.txt b/Cli/CMakeLists.txt
@@ -8,7 +8,7 @@ include ("${CMAKE_CURRENT_LIST_DIR}/../Core/CMakeLists.txt")
 
 # LIB
 
-add_library (FBX-glTF-conv-lib STATIC "${CMAKE_CURRENT_LIST_DIR}/ReadCliArgs.cpp")
+add_library (FBX-glTF-conv-lib STATIC "${CMAKE_CURRENT_LIST_DIR}/ReadCliArgs.cpp" "${CMAKE_CURRENT_LIST_DIR}/Version.cpp")
 
 set_target_properties (FBX-glTF-conv-lib PROPERTIES CXX_STANDARD 20)
 

diff --git a/Cli/Cli.cpp b/Cli/Cli.cpp
@@ -144,7 +144,7 @@ int main(int argc_, const char *argv_[]) {
 
   if (std::holds_alternative<beecli::VersionCommand>(*parsedCommand)) {
     const auto &command = std::get<beecli::VersionCommand>(*parsedCommand);
-    std::cout << beecli::version_string << std::endl;
+    std::cout << beecli::version_string << std::flush;
     return 0;
   }
 

diff --git a/Cli/Version.cpp b/Cli/Version.cpp
@@ -0,0 +1,13 @@
+#include "./Version.h"
+
+#ifndef FBX_GLTF_CONV_CLI_VERSION
+#  define FBX_GLTF_CONV_CLI_VERSION_STRING ""
+#else
+#  define TO_FBX_GLTF_CONV_CLI_VERSION_STRING(x) #x
+#  define TO_FBX_GLTF_CONV_CLI_VERSION_STRING2(x) TO_FBX_GLTF_CONV_CLI_VERSION_STRING(x)
+#  define FBX_GLTF_CONV_CLI_VERSION_STRING TO_FBX_GLTF_CONV_CLI_VERSION_STRING2(FBX_GLTF_CONV_CLI_VERSION)
+#endif
+
+namespace beecli {
+const std::string version_string = FBX_GLTF_CONV_CLI_VERSION_STRING;
+} // namespace beecli
diff --git a/Cli/Version.h b/Cli/Version.h
@@ -3,13 +3,5 @@
 #include <string>
 
 namespace beecli {
-#ifndef FBX_GLTF_CONV_CLI_VERSION
-#  define FBX_GLTF_CONV_CLI_VERSION_STRING ""
-#else
-#  define TO_FBX_GLTF_CONV_CLI_VERSION_STRING(x) #x
-#  define TO_FBX_GLTF_CONV_CLI_VERSION_STRING2(x) TO_FBX_GLTF_CONV_CLI_VERSION_STRING(x)
-#  define FBX_GLTF_CONV_CLI_VERSION_STRING TO_FBX_GLTF_CONV_CLI_VERSION_STRING2(FBX_GLTF_CONV_CLI_VERSION)
-#endif
-
-inline const std::string version_string = FBX_GLTF_CONV_CLI_VERSION_STRING;
+extern const std::string version_string;
 } // namespace beecli