Skip to content

Commit e2fb3ce

Browse files
build: correct OCL driver version in case of non-zero hotfix version
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com> Source: 5d3b855
1 parent 4da61a8 commit e2fb3ce

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

version.cmake

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,25 @@ else()
1414
set(NEO_REVISION ${NEO_VERSION_BUILD})
1515
endif()
1616

17-
if(NOT DEFINED NEO_VERSION_HOTFIX)
18-
set(NEO_VERSION_HOTFIX 0)
19-
endif()
20-
2117
if(NEO_VERSION_BUILD MATCHES "^([0-9]+)\\.([0-9]+)$")
2218
set(NEO_VERSION_BUILD "${CMAKE_MATCH_1}")
19+
if(DEFINED NEO_VERSION_HOTFIX AND NOT ("${NEO_VERSION_HOTFIX}" STREQUAL "${CMAKE_MATCH_2}"))
20+
message(FATAL_ERROR "Inconsistent hotfix version provided: ${NEO_VERSION_HOTFIX} vs ${CMAKE_MATCH_2}")
21+
endif()
2322
set(NEO_VERSION_HOTFIX "${CMAKE_MATCH_2}")
2423
endif()
2524

25+
if(NOT DEFINED NEO_VERSION_HOTFIX)
26+
set(NEO_VERSION_HOTFIX 0)
27+
endif()
28+
2629
# OpenCL package version
2730
set(NEO_OCL_DRIVER_VERSION "${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}")
2831

32+
if(NOT ("${NEO_VERSION_HOTFIX}" STREQUAL "0"))
33+
set(NEO_OCL_DRIVER_VERSION "${NEO_OCL_DRIVER_VERSION}.${NEO_VERSION_HOTFIX}")
34+
endif()
35+
2936
# Level-Zero package version
3037
set(NEO_L0_VERSION_MAJOR 1)
3138
set(NEO_L0_VERSION_MINOR 6)

0 commit comments

Comments
 (0)