library version definition move to CMakeLists.txt

4 files changed, 25 insertions, 17 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1a438c..7cd2a5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,9 +3,17 @@
 #
 
 project(O-3000-Driver)
-cmake_minimum_required(VERSION 2.4)
+
+cmake_minimum_required(VERSION 3.0)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
+# library version definition
+set(VERSION_MAJOR "2")
+set(VERSION_MINOR "0")
+set(VERSION_RELEASE "3")
+set(VERSION_STR "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}")
+add_definitions(-DO3000_VERSION="${VERSION_STR}")
+
 # find libusb library (version 1.0.19 or higher is needed!)
 find_package(LibUSB REQUIRED)
 
@@ -21,11 +29,11 @@ add_library(				o3000 SHARED
 
 set_target_properties	(	o3000 PROPERTIES
 							OUTPUT_NAME "o3000"
-							VERSION 2.0.2
-							SOVERSION 2
+							VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}"
+							SOVERSION ${VERSION_MAJOR}
 							LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
 						)
-						
+
 target_compile_options(o3000 PRIVATE -Wall -g -ggdb -O3 -fPIC)
 target_link_libraries(o3000 pthread ${LIBUSB_LIBRARIES})
 
diff --git a/ChangeLog b/ChangeLog
index afab5af..254fc9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,12 +3,14 @@
 -------------------------------------------------------------------------------
 
 Version 2.0.3
-	2019-09-25 - SP
+	2019-09-25 SP
 	* Added "paranoia check" for wraparound_chunk_size check in handle_transfer().
 	* Moved macro definition of MAX_IMAGE_SIZE from o3000.c to o3000_private.h.
+	2019-10-22 PR
+	* Library version defined in CMakeLists.txt.
 
 Version 2.0.2
-	2018-04-11-PR
+	2018-04-11 PR
 	* Function handle_transfer() rewritten:
 	  The image frame synchronization was a bit hacky. Image frames were passed only to the
 	  overlaying application after the next image frame has been received. But when receiving a single
@@ -24,7 +26,7 @@ Version 2.0.2
 	  This loglevel will set the libusb to debugging mode and is very useful for debugging purposes.
 
 Version 2.0.1
-	2015-08-11 -PR
+	2015-08-11 PR
 	* Bugfix in function handle_transfer(): A negative byte offset was calculated when the resolution 
 	  has changed during wrap-around. A SEGFAULT occured.
     * Fields added to image header and image header version update to 4:
@@ -43,9 +45,11 @@ Version 2.0.1
 	2016-03-01
 	* Calling convention added for Win32 and Win64.
 	 
-Version 2.0.0 - 2015-02-16
-	* PR: Multi camera sessions capability. The host can scan the number of cameras and establish a connection to
+Version 2.0.0
+	2015-02-16 PR
+	* Multi camera sessions capability. The host can scan the number of cameras and establish a connection to
 	  each of them. Sending a XML message to the camera uses the synchronous API with OS dependet timeout handling.
 
-Version 1.0.0 - 2015-02-16
-	* PB: Inititial version
+Version 1.0.0 
+	2015-02-16 PB
+	* Inititial version
diff --git a/o3000.c b/o3000.c
index 89e6299..dd99f97 100644
--- a/o3000.c
+++ b/o3000.c
@@ -1313,6 +1313,8 @@ int __stdcall o3000_init(int vid, int pid, unsigned int video_cache_size,
 	new_session->video_cb = video_cb;
 	new_session->log_cb = log_cb;
 	
+	o3000_log(new_session, O3000_LOG_INFO, "%s: O-3000 driver version %s\n", __func__, O3000_VERSION);
+	
 	
 	// open libusb context
 	ret = libusb_init(&(new_session->libusb_ctx));
diff --git a/o3000.h b/o3000.h
index 274956e..51c8c3b 100644
--- a/o3000.h
+++ b/o3000.h
@@ -33,16 +33,10 @@
 #include "o3000_portable.h"

 #include "image_header.h"

 

-/**

- * O-3000 library version

- */

-#define O3000_VERSION				"2.0.3"

-

 

 #define O3000_VID	0x0483			///< O3000 vendor ID

 #define O3000_PID	0xA098			///< O3000 product ID

 

-

 /*

  * All possible error codes

  */