Changeset 19755 for trunk

Timestamp:

10/11/19 09:31:48 (5 years ago)

Author:

tbretz

Message:

Make it more robust against missing version numbers.

File:

• trunk/Mars/cmake/rootlogon.C.in (modified) (1 diff)

trunk/Mars/cmake/rootlogon.C.in

@@ -44 +44 @@
 #include <iomanip>
 
-#cmakedefine ROOT_VERSION_AVAILABLE "@ROOT_VERSION_MAJOR@"
+#define ROOT_LIB_VERSION_MAJOR (@ROOT_VERSION_MAJOR@+0)
+#define ROOT_LIB_VERSION_MINOR (@ROOT_VERSION_MINOR@+0)
+#define ROOT_LIB_VERSION_PATCH (@ROOT_VERSION_PATCH@+0)
 
-#if defined(ROOT_VERSION_CODE) && defined(ROOT_VERSION_AVAILABLE)
+#if defined(ROOT_VERSION_CODE) && (ROOT_LIB_VERSION_MAJOR!=0)
 #if ROOT_VERSION_CODE != ROOT_VERSION(${ROOT_VERSION_MAJOR},${ROOT_VERSION_MINOR},${ROOT_VERSION_PATCH})
-#error Started ROOT version does not match ROOT version linked with libmars.so
+#warning Started ROOT version does not match ROOT version linked with libmars.so
 #endif
 #endif