Changed __VERSION__ to __LIBVER__ to avoid clashing with GCC predefs.

openpnp · Aug 1, 2017 · 310058e · 310058e
1 parent 85c69ab
commit 310058e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,7 +18,7 @@ set(CMAKE_CXX_STANDARD 11)
 
 
 # library version
-add_definitions(-D__VERSION__="v0.01")
+add_definitions(-D__LIBVER__="v0.01")
 
 # determine number of bits of compiler
 if( CMAKE_SIZEOF_VOID_P EQUAL 8 )

diff --git a/common/libmain.cpp b/common/libmain.cpp
@@ -293,8 +293,8 @@ DLLPUBLIC CapResult Cap_setAutoProperty(CapContext ctx, CapStream stream, CapPro
 
 DLLPUBLIC const char* Cap_getLibraryVersion()
 {
-    #ifndef __VERSION__
-    #define __VERSION__ "VERSION UNKNOWN"
+    #ifndef __LIBVER__
+    #define __LIBVER__ "VERSION UNKNOWN"
     #endif 
 
     #ifndef __PLATFORM__
@@ -305,7 +305,7 @@ DLLPUBLIC const char* Cap_getLibraryVersion()
     #define __BUILDTYPE__ "BUILDTYPE UNKNOWN"
     #endif
 
-    static const char versionString[] = __PLATFORM__ " " __BUILDTYPE__ " " __VERSION__ " " __DATE__ " ";
+    static const char versionString[] = __PLATFORM__ " " __BUILDTYPE__ " " __LIBVER__ " " __DATE__ " ";
 
     return versionString;
 }
diff --git a/include/openpnp-capture.h b/include/openpnp-capture.h
@@ -239,7 +239,7 @@ DLLPUBLIC void Cap_setLogLevel(uint32_t level);
     When building the library, please set the 
     following defines in the build environment:
 
-    __VERSION__
+    __LIBVER__
     __PLATFORM__
     __BUILDTYPE__
     

diff --git a/linux/tests/main.cpp b/linux/tests/main.cpp
@@ -50,6 +50,8 @@ int main(int argc, char*argv[])
     uint32_t deviceID       = 0;
 
     printf("OpenPNP Capture Test Program\n");
+    printf("%s\n", Cap_getLibraryVersion());
+
     Cap_setLogLevel(7);
 
     if (argc >= 2)