Commit 76d1f8d1 authored by Carsten Kemena's avatar Carsten Kemena

improved version handling/corrected radient help message

parent 370d5e57
......@@ -2,6 +2,8 @@ GPATH
GRTAGS
GTAGS
/src/version.hpp
# Compiled Object files
*.slo
*.lo
......
......@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 2.6)
project (RADIANT C CXX)
SET(MAJOR_VERSION 1)
SET(MINOR_VERSION 0)
SET(PATCH_VERSION 0)
SET(MAJOR_VERSION 0)
SET(MINOR_VERSION 9)
SET(PATCH_VERSION 1-beta)
SET(CMAKE_CXX_FLAGS_COVERAGE
"-g -O0 --coverage -fprofile-arcs -ftest-coverage -fno-inline -fno-inline-small-functions -fno-default-inline"
......@@ -72,8 +72,8 @@ ADD_DEFINITIONS( "-DHAS_BOOST" )
find_package (Threads REQUIRED)
configure_file (
"${PROJECT_SOURCE_DIR}/src/Version.hpp.in"
"${PROJECT_SOURCE_DIR}/src/Version.hpp"
"${PROJECT_SOURCE_DIR}/src/version.hpp.in"
"${PROJECT_SOURCE_DIR}/src/version.hpp"
)
################################################
......
......@@ -38,7 +38,7 @@ main(int argc, char const *argv[])
{
fs::path inFile, outFile;
size_t nThreads;
std::string radiantDBVersion = "0.9.1-beta";
std::string radiantDBVersion(std::string(STR(MAJOR_VERSION)) + "." + std::string(STR(MINOR_VERSION)) + "." + std::string(STR(PATCH_VERSION)) );
po::options_description allOpts("makeRadiantDB " + radiantDBVersion + " (C) 2017 Carsten Kemena\nThis program comes with ABSOLUTELY NO WARRANTY;\n\nAllowed options are displayed below.");
po::options_description general("General options");
general.add_options()
......
......@@ -17,6 +17,7 @@
#include "common.hpp"
#include "version.hpp"
namespace po = boost::program_options;
namespace fs = boost::filesystem;
......
......@@ -23,6 +23,7 @@
#include "../libs/BioSeqDataLib/src/external_interfaces/domainProgs.hpp"
#include "common.hpp"
#include "version.hpp"
using namespace std;
using std::chrono::system_clock;
......@@ -219,8 +220,8 @@ printHeader(const std::string &radiantVersion, bool pfamLike, bool translate, co
int
main(int argc, char const *argv[])
{
std::string radiantVersion(std::string(STR(MAJOR_VERSION)) + "." + std::string(STR(MINOR_VERSION)) + "." + std::string(STR(PATCH_VERSION)) );
fs::path inFile, databaseFile;
string radiantVersion = "0.9.1-beta";
po::options_description allOpts("radiant " + radiantVersion + " (C) 2017 Carsten Kemena\nThis program comes with ABSOLUTELY NO WARRANTY;\n\nAllowed options are displayed below.");
po::options_description general("General options");
general.add_options()
......@@ -252,7 +253,7 @@ main(int argc, char const *argv[])
allOpts.add(general).add(outputO).add(translateO).add(hiddenO);
po::options_description visible("Allowed options");
po::options_description visible("radiant " + radiantVersion + " (C) 2017 Carsten Kemena\nThis program comes with ABSOLUTELY NO WARRANTY;\n\nAllowed options are displayed below.");
visible.add(general).add(outputO).add(translateO);
try
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment