Changeset 19755


Ignore:
Timestamp:
Oct 11, 2019, 9:31:48 AM (8 days ago)
Author:
tbretz
Message:
Make it more robust against missing version numbers.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/cmake/rootlogon.C.in

    r19750 r19755  
    4444#include <iomanip>
    4545
    46 #cmakedefine ROOT_VERSION_AVAILABLE "@ROOT_VERSION_MAJOR@"
     46#define ROOT_LIB_VERSION_MAJOR (@ROOT_VERSION_MAJOR@+0)
     47#define ROOT_LIB_VERSION_MINOR (@ROOT_VERSION_MINOR@+0)
     48#define ROOT_LIB_VERSION_PATCH (@ROOT_VERSION_PATCH@+0)
    4749
    48 #if defined(ROOT_VERSION_CODE) && defined(ROOT_VERSION_AVAILABLE)
     50#if defined(ROOT_VERSION_CODE) && (ROOT_LIB_VERSION_MAJOR!=0)
    4951#if ROOT_VERSION_CODE != ROOT_VERSION(${ROOT_VERSION_MAJOR},${ROOT_VERSION_MINOR},${ROOT_VERSION_PATCH})
    50 #error Started ROOT version does not match ROOT version linked with libmars.so
     52#warning Started ROOT version does not match ROOT version linked with libmars.so
    5153#endif
    5254#endif
Note: See TracChangeset for help on using the changeset viewer.