Build: Change versioning policy.

Don't set patch version number on master branch.

Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c205eca..969c9de 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
 PROJECT(OCL)
 set (LIBCL_DRIVER_VERSION_MAJOR 0)
 set (LIBCL_DRIVER_VERSION_MINOR 9)
-set (LIBCL_DRIVER_VERSION_PATCH 1)
 set (LIBCL_C_VERSION_MAJOR 1)
 set (LIBCL_C_VERSION_MINOR 2)
 

diff --git a/src/OCLConfig.h.in b/src/OCLConfig.h.in
index 71de4b3..8662584 100644 (file)
--- a/src/OCLConfig.h.in
+++ b/src/OCLConfig.h.in
@@ -1,6 +1,5 @@
 // the configured options and settings for LIBCL
 #define LIBCL_DRIVER_VERSION_MAJOR @LIBCL_DRIVER_VERSION_MAJOR@
 #define LIBCL_DRIVER_VERSION_MINOR @LIBCL_DRIVER_VERSION_MINOR@
-#define LIBCL_DRIVER_VERSION_PATCH @LIBCL_DRIVER_VERSION_PATCH@
 #define LIBCL_C_VERSION_MAJOR @LIBCL_C_VERSION_MAJOR@
 #define LIBCL_C_VERSION_MINOR @LIBCL_C_VERSION_MINOR@

diff --git a/src/cl_platform_id.h b/src/cl_platform_id.h
index c7c716e..2a9c07a 100644 (file)
--- a/src/cl_platform_id.h
+++ b/src/cl_platform_id.h
@@ -64,7 +64,7 @@ extern cl_int cl_get_platform_info(cl_platform_id    platform,
 #define _JOINT3(x, y, z) _STR(x) "." _STR(y) "." _STR(z)
 
 
-#define LIBCL_DRIVER_VERSION_STRING _JOINT3(LIBCL_DRIVER_VERSION_MAJOR, LIBCL_DRIVER_VERSION_MINOR, LIBCL_DRIVER_VERSION_PATCH)
+#define LIBCL_DRIVER_VERSION_STRING _JOINT(LIBCL_DRIVER_VERSION_MAJOR, LIBCL_DRIVER_VERSION_MINOR)
 #define LIBCL_VERSION_STRING "OpenCL " _JOINT(LIBCL_C_VERSION_MAJOR, LIBCL_C_VERSION_MINOR) " beignet " LIBCL_DRIVER_VERSION_STRING
 #define LIBCL_C_VERSION_STRING "OpenCL C " _JOINT(LIBCL_C_VERSION_MAJOR, LIBCL_C_VERSION_MINOR) " beignet " LIBCL_DRIVER_VERSION_STRING