version info from release archive, fix GATB#47

fgindraud · Jan 12, 2021 · c7bfb0d · c7bfb0d
1 parent 9b7b581
commit c7bfb0d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/bcalm_1.cpp b/src/bcalm_1.cpp
@@ -81,9 +81,11 @@ struct Functor  {  void operator ()  (bcalm_1 *bcalm)
 
 void bcalm_1::execute (){
 
+    std::cout << "BCALM 2, version " << VERSION; 
 #ifdef GIT_SHA1
-    std::cout << "BCALM 2, version " << VERSION << ", git commit " << GIT_SHA1 << std::endl;
+    std::cout << ", git commit " << GIT_SHA1;
 #endif
+    std::cout << std::endl;
 
 
     /** we get the kmer size chosen by the end user. */

diff --git a/src/main.cpp b/src/main.cpp
@@ -25,14 +25,16 @@
 
 int main (int argc, char* argv[])
 {
-
+
+
+     if(argc > 1 && (   strcmp(argv[1],STR_VERSION)==0 || strcmp(argv[1],"-v")==0    )     ){
+        std::cout << "BCALM 2, version " << VERSION;
 #ifdef GIT_SHA1
-	if(argc > 1 && (   strcmp(argv[1],STR_VERSION)==0 || strcmp(argv[1],"-v")==0    )     ){
-        std::cout << "BCALM 2, version " << VERSION << ", git commit " << GIT_SHA1 << std::endl;
-     	std::cout << "Using gatb-core version "<< System::info().getVersion() << std::endl;
+        std::cout << ", git commit " << GIT_SHA1;
+#endif
+     	std::cout << std::endl << "Using gatb-core version "<< System::info().getVersion() << std::endl;
 		return EXIT_SUCCESS;
 	}
-#endif
 
     try
     {