Skip to content

GitLab

Commit 32e08b87 authored by peastman's avatar peastman
Browse files

Merge pull request #1500 from peastman/version 

Platform::getOpenMMVersion() includes patch version
parents 6c6d68d2 086501a7
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
olla/src/Platform.cpp
View file @ 32e08b87
...@@ -320,7 +320,11 @@ const string& Platform::getDefaultPluginsDirectory() { ...@@ -320,7 +320,11 @@ const string& Platform::getDefaultPluginsDirectory() {
#define STRING(x) STRING1(x) #define STRING(x) STRING1(x)
const string& Platform::getOpenMMVersion() { const string& Platform::getOpenMMVersion() {
#if OPENMM_BUILD_VERSION == 0
static const string version = STRING(OPENMM_MAJOR_VERSION) "." STRING(OPENMM_MINOR_VERSION); static const string version = STRING(OPENMM_MAJOR_VERSION) "." STRING(OPENMM_MINOR_VERSION);
#else
static const string version = STRING(OPENMM_MAJOR_VERSION) "." STRING(OPENMM_MINOR_VERSION) "." STRING(OPENMM_BUILD_VERSION);
#endif
return version; return version;
} }
......
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