include submodule git versions into log files

Makefile.am

@@ -1,4 +1,5 @@
 DEPLOIDVERSION = $(shell git show HEAD | head -1 | sed -e "s/commit //g" | cat)
+LASSOVERSION = $(shell git submodule status | grep DEploid-Lasso-lib | sed -e "s/ //g" -e "s/DEploid.*//" | cat)
 EXTRA_DIST = bootstrap \
              $(top_srcdir)/utilities/dataExplore.r \
              $(top_srcdir)/utilities/interpretDEploid.r \
@@ -15,7 +16,7 @@ TESTS = unit_tests io_unit_tests
 check_PROGRAMS = unit_tests dEploid_dbg dEploid_prof io_unit_tests
 PROG = DEPLOID
 
-common_flags = -std=c++0x -Isrc/ -Isrc/codeCogs/ -Isrc/random/ -Isrc/gzstream/ -Isrc/lasso/ -DDEPLOIDVERSION=\"${DEPLOIDVERSION}\" -DCOMPILEDATE=\"${COMPILEDATE}\"
+common_flags = -std=c++0x -Isrc/ -Isrc/codeCogs/ -Isrc/random/ -Isrc/gzstream/ -Isrc/lasso/ -DDEPLOIDVERSION=\"${DEPLOIDVERSION}\" -DLASSOVERSION=\"${LASSOVERSION}\" -DCOMPILEDATE=\"${COMPILEDATE}\"
 common_LDADD = -lz
 
 common_src = src/random/fastfunc.cpp \

src/dEploid.cpp

@@ -109,7 +109,7 @@ int main(int argc, char *argv[]) {
                 dEploidIO.setDoUpdateProp(false);
                 delete ibdMcmcSample;
             }
-            if (dEploidIO.useIbdOnly() == false){
+            if (dEploidIO.useIbdOnly() == false) {
                 McmcSample * mcmcSample = new McmcSample();
                 MersenneTwister rg(dEploidIO.randomSeed());
 

src/dEploidIO.cpp

@@ -155,6 +155,14 @@ void DEploidIO::init() {
     #else
         dEploidGitVersion_ = "";
     #endif
+
+    #ifdef DEPLOIDVERSION
+        lassoGitVersion_ = LASSOVERSION;
+    #else
+        lassoGitVersion_ = "";
+    #endif
+
+
 }
 
 
@@ -567,7 +575,8 @@ void DEploidIO::printVersion(std::ostream& out) {
     out << endl
         << "dEploid " << VERSION
         << endl
-        << "Git commit: " << dEploidGitVersion_ << endl;
+        << "Git commit (DEploid): " << dEploidGitVersion_ << endl
+        << "Git commit (Lasso): " << lassoGitVersion_ << endl;
 }
 
 void DEploidIO::printHelp(std::ostream& out) {

src/dEploidIO.hpp

@@ -227,6 +227,7 @@ class DEploidIO{
 
     // Output stream
     string dEploidGitVersion_;
+    string lassoGitVersion_;
     string compileTime_;
     string strExportLLK;
     string strExportHap;

src/export/dEploidIOExport.cpp

@@ -79,6 +79,7 @@ void DEploidIO::writeLog ( ostream * writeTo ){
     (*writeTo) << "\n";
     (*writeTo) << "Program was compiled on: " << compileTime_ << endl;
     (*writeTo) << "dEploid version: " << dEploidGitVersion_ << endl;
+    (*writeTo) << "lasso version: " << lassoGitVersion_ << endl;
     (*writeTo) << "\n";
     (*writeTo) << "Input data: \n";
     if (panelFileName_.size() > 0){