From 3f2ebeba716ccc04f08e4245db4ffbc377c10206 Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Thu, 26 Oct 2017 08:07:28 +0000
Subject: VERSION now contains the GEMMA version number. A script generates a
 header file named ./src/version.h. See Makefile for details.

---
 src/gemma.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/gemma.cpp')

diff --git a/src/gemma.cpp b/src/gemma.cpp
index 650ba43..2c54672 100644
--- a/src/gemma.cpp
+++ b/src/gemma.cpp
@@ -57,10 +57,11 @@ extern "C" {
 #include "varcov.h"
 #include "vc.h"
 #include "debug.h"
+#include "version.h"
 
 using namespace std;
 
-GEMMA::GEMMA(void) : version("0.97.3"), date("10/10/2017"), year("2017") {}
+GEMMA::GEMMA(void) : version(GEMMA_VERSION), date(GEMMA_DATE), year(GEMMA_YEAR) {}
 
 void gemma_gsl_error_handler (const char * reason,
                               const char * file,
@@ -3103,7 +3104,7 @@ void GEMMA::WriteLog(int argc, char **argv, PARAM &cPar) {
   }
 
   outfile << "##" << endl;
-  outfile << "## GEMMA Version    = " << version << endl;
+  outfile << "## GEMMA Version    = " << version << " (" << date << ")" << endl;
   outfile << "## GSL Version      = " << GSL_VERSION << endl;
   outfile << "## Eigen Version    = " << EIGEN_WORLD_VERSION << "." << EIGEN_MAJOR_VERSION << "." << EIGEN_MINOR_VERSION << endl;
 #ifdef OPENBLAS
-- 
cgit v1.2.3