Skip to content

Commit 022d851

Browse files
amielczapszymich
amielcza
authored and
pszymich
committed
Semantic versioning implementation
Rename IGC packages to adhere to semver guidelines. (cherry picked from commit aa8bf01)
1 parent dd7a8e9 commit 022d851

File tree

1 file changed

+22
-15
lines changed

1 file changed

+22
-15
lines changed

‎IGC/CMakeLists.txt‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,15 @@ endif()
3737
if(NOT DEFINED IGC_API_MINOR_VERSION)
3838
set(IGC_API_MINOR_VERSION 0)
3939
endif()
40-
# IGC_API_PATCH_VERSION
40+
if(NOT DEFINED IGC_API_PATCH_VERSION)
41+
set(IGC_API_PATCH_VERSION 0)
42+
endif()
43+
44+
# IGC_BUILD_ID
4145
if(DEFINED IGC_PACKAGE_RELEASE)
42-
set(IGC_API_PATCH_VERSION ${IGC_PACKAGE_RELEASE})
46+
set(IGC_BUILD_ID ${IGC_PACKAGE_RELEASE})
4347
else()
44-
set(IGC_API_PATCH_VERSION 1)
48+
set(IGC_BUILD_ID 0)
4549
endif()
4650

4751
set(CMAKE_CXX_STANDARD 17)
@@ -2241,33 +2245,36 @@ if(UNIX)
22412245
set(CPACK_PACKAGE_VERSION_MAJOR ${IGC_API_MAJOR_VERSION})
22422246
set(CPACK_PACKAGE_VERSION_MINOR ${IGC_API_MINOR_VERSION})
22432247
set(CPACK_PACKAGE_VERSION_PATCH ${IGC_API_PATCH_VERSION})
2248+
set(CPACK_PACKAGE_VERSION_BUILD ${IGC_BUILD_ID})
22442249
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
2250+
set(PACKAGE_VERSION_WTH_METADATA "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}+${CPACK_PACKAGE_VERSION_BUILD}")
2251+
22452252
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${IGC_INSTALL_TIME_ROOT_DIR})
22462253
set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "postinst;postrm")
22472254
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Intel(R) Graphics Compiler for OpenCL(TM)")
22482255
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
22492256
set(CPACK_RPM_PACKAGE_RELOCATABLE TRUE)
22502257

2251-
set(CPACK_DEBIAN_IGC-CORE_FILE_NAME "intel-igc-core_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
2252-
set(CPACK_DEBIAN_IGC-MEDIA_FILE_NAME "intel-igc-media_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
2258+
set(CPACK_DEBIAN_IGC-CORE_FILE_NAME "intel-igc-core_${PACKAGE_VERSION_WTH_METADATA}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
2259+
set(CPACK_DEBIAN_IGC-MEDIA_FILE_NAME "intel-igc-media_${PACKAGE_VERSION_WTH_METADATA}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
22532260
set(CPACK_DEBIAN_IGC-MEDIA_PACKAGE_DEPENDS "intel-igc-core(=${CPACK_PACKAGE_VERSION})")
2254-
set(CPACK_DEBIAN_IGC-OPENCL_FILE_NAME "intel-igc-opencl_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
2261+
set(CPACK_DEBIAN_IGC-OPENCL_FILE_NAME "intel-igc-opencl_${PACKAGE_VERSION_WTH_METADATA}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
22552262
set(CPACK_DEBIAN_IGC-OPENCL_PACKAGE_DEPENDS "intel-igc-core(=${CPACK_PACKAGE_VERSION})")
2256-
set(CPACK_DEBIAN_IGC-OPENCL-DEVEL_FILE_NAME "intel-igc-opencl-devel_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
2263+
set(CPACK_DEBIAN_IGC-OPENCL-DEVEL_FILE_NAME "intel-igc-opencl-devel_${PACKAGE_VERSION_WTH_METADATA}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
22572264
set(CPACK_DEBIAN_IGC-OPENCL-DEVEL_PACKAGE_DEPENDS "intel-igc-opencl(=${CPACK_PACKAGE_VERSION})")
22582265

2259-
set(CPACK_RPM_IGC-CORE_FILE_NAME "intel-igc-core-${CPACK_PACKAGE_VERSION}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
2260-
set(CPACK_RPM_IGC-MEDIA_FILE_NAME "intel-igc-media-${CPACK_PACKAGE_VERSION}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
2266+
set(CPACK_RPM_IGC-CORE_FILE_NAME "intel-igc-core-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
2267+
set(CPACK_RPM_IGC-MEDIA_FILE_NAME "intel-igc-media-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
22612268
set(CPACK_RPM_IGC-MEDIA_PACKAGE_REQUIRES "intel-igc-core = ${CPACK_PACKAGE_VERSION}")
2262-
set(CPACK_RPM_IGC-OPENCL_FILE_NAME "intel-igc-opencl-${CPACK_PACKAGE_VERSION}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
2269+
set(CPACK_RPM_IGC-OPENCL_FILE_NAME "intel-igc-opencl-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
22632270
set(CPACK_RPM_IGC-OPENCL_PACKAGE_REQUIRES "intel-igc-core = ${CPACK_PACKAGE_VERSION}")
2264-
set(CPACK_RPM_IGC-OPENCL-DEVEL_FILE_NAME "intel-igc-opencl-devel-${CPACK_PACKAGE_VERSION}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
2271+
set(CPACK_RPM_IGC-OPENCL-DEVEL_FILE_NAME "intel-igc-opencl-devel-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
22652272
set(CPACK_RPM_IGC-OPENCL-DEVEL_PACKAGE_REQUIRES "intel-igc-opencl = ${CPACK_PACKAGE_VERSION}}")
22662273

2267-
set(CPACK_ARCHIVE_IGC-CORE_FILE_NAME "intel-igc-core-${CPACK_PACKAGE_VERSION}.${CPACK_PACKAGE_ARCHITECTURE}")
2268-
set(CPACK_ARCHIVE_IGC-MEDIA_FILE_NAME "intel-igc-media-${CPACK_PACKAGE_VERSION}.${CPACK_PACKAGE_ARCHITECTURE}")
2269-
set(CPACK_ARCHIVE_IGC-OPENCL_FILE_NAME "intel-igc-opencl-${CPACK_PACKAGE_VERSION}.${CPACK_PACKAGE_ARCHITECTURE}")
2270-
set(CPACK_ARCHIVE_IGC-OPENCL-DEVEL_FILE_NAME "intel-igc-opencl-devel-${CPACK_PACKAGE_VERSION}.${CPACK_PACKAGE_ARCHITECTURE}")
2274+
set(CPACK_ARCHIVE_IGC-CORE_FILE_NAME "intel-igc-core-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_PACKAGE_ARCHITECTURE}")
2275+
set(CPACK_ARCHIVE_IGC-MEDIA_FILE_NAME "intel-igc-media-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_PACKAGE_ARCHITECTURE}")
2276+
set(CPACK_ARCHIVE_IGC-OPENCL_FILE_NAME "intel-igc-opencl-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_PACKAGE_ARCHITECTURE}")
2277+
set(CPACK_ARCHIVE_IGC-OPENCL-DEVEL_FILE_NAME "intel-igc-opencl-devel-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_PACKAGE_ARCHITECTURE}")
22712278

22722279
# Create separate debug symbol packages if the CMake/CPack version in use
22732280
# provides stable support for that functionality.

0 commit comments

Comments
 (0)