diff --git a/src/bcalm_1.cpp b/src/bcalm_1.cpp index a14e952..0816de7 100644 --- 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 index a586c81..765ca9e 100644 --- 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 {