build: correct OCL version setting

- ignore hotfix number if NEO_VERSION_HOTFIX was set to 0
- respect hotfix number if NEO_VERSION_BUILD contains both build and hotfix
even if NEO_VERSION_BUILD has hotfix number 0
- detect inconsistent setting of hotfix number

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
Source: 71a9731

Author: JablonskiMateusz

version.cmake

@@ -14,24 +14,26 @@ else()
   set(NEO_REVISION ${NEO_VERSION_BUILD})
 endif()
 
+if(NOT DEFINED NEO_VERSION_HOTFIX)
+  set(NEO_VERSION_HOTFIX 0)
+endif()
+
+set(NEO_OCL_VERSION_SUFFIX "")
+if(NOT ("${NEO_VERSION_HOTFIX}" STREQUAL "0"))
+  set(NEO_OCL_VERSION_SUFFIX ".${NEO_VERSION_HOTFIX}")
+endif()
+
 if(NEO_VERSION_BUILD MATCHES "^([0-9]+)\\.([0-9]+)$")
   set(NEO_VERSION_BUILD "${CMAKE_MATCH_1}")
-  if(DEFINED NEO_VERSION_HOTFIX AND NOT ("${NEO_VERSION_HOTFIX}" STREQUAL "${CMAKE_MATCH_2}"))
+  if(NOT ("${NEO_OCL_VERSION_SUFFIX}" STREQUAL "") AND NOT ("${NEO_OCL_VERSION_SUFFIX}" STREQUAL ".${CMAKE_MATCH_2}"))
     message(FATAL_ERROR "Inconsistent hotfix version provided: ${NEO_VERSION_HOTFIX} vs ${CMAKE_MATCH_2}")
   endif()
   set(NEO_VERSION_HOTFIX "${CMAKE_MATCH_2}")
-endif()
-
-if(NOT DEFINED NEO_VERSION_HOTFIX)
-  set(NEO_VERSION_HOTFIX 0)
+  set(NEO_OCL_VERSION_SUFFIX ".${NEO_VERSION_HOTFIX}")
 endif()
 
 # OpenCL package version
-set(NEO_OCL_DRIVER_VERSION "${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}")
-
-if(NOT ("${NEO_VERSION_HOTFIX}" STREQUAL "0"))
-  set(NEO_OCL_DRIVER_VERSION "${NEO_OCL_DRIVER_VERSION}.${NEO_VERSION_HOTFIX}")
-endif()
+set(NEO_OCL_DRIVER_VERSION "${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}${NEO_OCL_VERSION_SUFFIX}")
 
 # Level-Zero package version
 set(NEO_L0_VERSION_MAJOR 1)