diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ee72b8..7b39f33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,22 @@ cmake_minimum_required(VERSION 3.2) project(minimac4 VERSION 1.0.1) set(CMAKE_CXX_STANDARD 11) -execute_process(COMMAND date OUTPUT_VARIABLE DATE OUTPUT_STRIP_TRAILING_WHITESPACE) -execute_process(COMMAND whoami OUTPUT_VARIABLE USER OUTPUT_STRIP_TRAILING_WHITESPACE) +if (DEFINED ENV{SOURCE_DATE_EPOCH}) + execute_process( + COMMAND "date" "-u" "-d" "@$ENV{SOURCE_DATE_EPOCH}" "+%Y-%m-%d" + OUTPUT_VARIABLE DATE + OUTPUT_STRIP_TRAILING_WHITESPACE) + set(USER "Reproducible") +else () + execute_process( + COMMAND "date" + OUTPUT_VARIABLE DATE + OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process( + COMMAND "whoami" + OUTPUT_VARIABLE USER + OUTPUT_STRIP_TRAILING_WHITESPACE) +endif () add_definitions(-DVERSION="${PROJECT_VERSION}" -DUSER="${USER}" -DDATE="${DATE}") diff --git a/src/HaplotypeSet.cpp b/src/HaplotypeSet.cpp index 19ae135..5fc0e43 100644 --- a/src/HaplotypeSet.cpp +++ b/src/HaplotypeSet.cpp @@ -1180,7 +1180,7 @@ bool HaplotypeSet::ScaffoldGWAStoReference(HaplotypeSet &rHap, AllVariable& MyAl { cout << "\n ERROR !!! \n No overlap between Target and Reference markers !!!\n"; - cout << " Please check for consistent marker identifer in reference and target input files..\n"; + cout << " Please check for consistent marker identifier in reference and target input files..\n"; cout << "\n Program Exiting ... \n\n"; return false; diff --git a/src/MarkovParameters.cpp b/src/MarkovParameters.cpp index d2b76ab..4733079 100644 --- a/src/MarkovParameters.cpp +++ b/src/MarkovParameters.cpp @@ -131,7 +131,7 @@ void MarkovParameters::CopyParameters(MarkovParameters & rhs) if(noMarker!=rhs.noMarker) { - cout<<"\n\n Run Time Error !!! Markov Parameters cannot be copied. Incosistent number of markers ...\n"; + cout<<"\n\n Run Time Error !!! Markov Parameters cannot be copied. Inconsistent number of markers ...\n"; cout<<" Contact Author for more details ...\n"; cout<<" Program Exiting ...\n\n"; abort(); @@ -154,7 +154,7 @@ void MarkovParameters::CopyParameters(MarkovParameters * rhs) if(noMarker!=rhs->noMarker) { - cout<<"\n\n Run Time Error !!! Markov Parameters cannot be copied. Incosistent number of markers ...\n"; + cout<<"\n\n Run Time Error !!! Markov Parameters cannot be copied. Inconsistent number of markers ...\n"; cout<<" Contact Author for more details ...\n"; cout<<" Program Exiting ...\n\n"; abort(); @@ -173,7 +173,7 @@ void MarkovParameters::CopyParametersNew(MarkovParameters * rhs) // if(noMarker!=rhs->noMarker) // { -// cout<<"\n\n Run Time Error !!! Markov Parameters cannot be copied. Incosistent number of markers ...\n"; +// cout<<"\n\n Run Time Error !!! Markov Parameters cannot be copied. Inconsistent number of markers ...\n"; // cout<<" Contact Author for more details ...\n"; // cout<<" Program Exiting ...\n\n"; // abort(); @@ -195,7 +195,7 @@ MarkovParameters & MarkovParameters::operator += (const MarkovParameters & rhs) if(noMarker!=rhs.noMarker) { - cout<<"\n\n Run Time Error !!! Markov Parameters cannot be copied. Incosistent number of markers ...\n"; + cout<<"\n\n Run Time Error !!! Markov Parameters cannot be copied. Inconsistent number of markers ...\n"; cout<<" Contact Author for more details ...\n"; cout<<" Program Exiting ...\n\n"; abort();