Skip to content

Commit 9283af1

Browse files
ArturHarasimiukgfxbot
ArturHarasimiuk
authored and
gfxbot
committed
cpack: allow setting of package release in package version and name
Change-Id: Iaa359d890e0481696808de099fb00586f2c8b335
1 parent 370a537 commit 9283af1

File tree

1 file changed

+29
-19
lines changed

1 file changed

+29
-19
lines changed

‎IGC/CMakeLists.txt

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3980,31 +3980,41 @@ if(UNIX)
39803980
set(CPACK_PACKAGE_VERSION_MAJOR ${IGC_API_MAJOR_VERSION})
39813981
set(CPACK_PACKAGE_VERSION_MINOR ${IGC_API_MINOR_VERSION})
39823982
set(CPACK_PACKAGE_VERSION_PATCH ${IGC_API_PATCH_VERSION})
3983+
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
39833984
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${IGC_INSTALL_TIME_ROOT_DIR})
39843985
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Intel(R) Graphics Compiler for OpenCL(TM)")
39853986
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
39863987
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
39873988
set(CPACK_RPM_PACKAGE_RELOCATABLE TRUE)
39883989
set(CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64")
3989-
3990-
set(CPACK_DEBIAN_IGC-CORE_FILE_NAME "intel-igc-core_${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}-${IGC_API_PATCH_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
3991-
set(CPACK_DEBIAN_IGC-MEDIA_FILE_NAME "intel-igc-media_${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}-${IGC_API_PATCH_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
3992-
set(CPACK_DEBIAN_IGC-MEDIA_PACKAGE_DEPENDS "intel-igc-core(=${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}.${IGC_API_PATCH_VERSION})")
3993-
set(CPACK_DEBIAN_IGC-OPENCL_FILE_NAME "intel-igc-opencl_${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}-${IGC_API_PATCH_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
3994-
set(CPACK_DEBIAN_IGC-OPENCL_PACKAGE_DEPENDS "intel-igc-core(=${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}.${IGC_API_PATCH_VERSION})")
3995-
set(CPACK_DEBIAN_IGC-OPENCL-DEVEL_FILE_NAME "intel-igc-opencl-devel_${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}-${IGC_API_PATCH_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
3996-
set(CPACK_DEBIAN_IGC-OPENCL-DEVEL_PACKAGE_DEPENDS "intel-igc-opencl(=${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}.${IGC_API_PATCH_VERSION})")
3997-
set(CPACK_RPM_IGC-CORE_FILE_NAME "intel-igc-core-${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}-${IGC_API_PATCH_VERSION}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
3998-
set(CPACK_RPM_IGC-MEDIA_FILE_NAME "intel-igc-media-${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}-${IGC_API_PATCH_VERSION}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
3999-
set(CPACK_RPM_IGC-MEDIA_PACKAGE_REQUIRES "intel-igc-core(=${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}.${IGC_API_PATCH_VERSION})")
4000-
set(CPACK_RPM_IGC-OPENCL_FILE_NAME "intel-igc-opencl-${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}-${IGC_API_PATCH_VERSION}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
4001-
set(CPACK_RPM_IGC-OPENCL_PACKAGE_REQUIRES "intel-igc-core(=${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}.${IGC_API_PATCH_VERSION})")
4002-
set(CPACK_RPM_IGC-OPENCL-DEVEL_FILE_NAME "intel-igc-opencl-devel-${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}-${IGC_API_PATCH_VERSION}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
4003-
set(CPACK_RPM_IGC-OPENCL-DEVEL_PACKAGE_REQUIRES "intel-igc-opencl(=${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}.${IGC_API_PATCH_VERSION})")
4004-
set(CPACK_ARCHIVE_IGC-CORE_FILE_NAME "intel-igc-core-${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}-${IGC_API_PATCH_VERSION}.${CPACK_PACKAGE_ARCHITECTURE}")
4005-
set(CPACK_ARCHIVE_IGC-MEDIA_FILE_NAME "intel-igc-media-${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}-${IGC_API_PATCH_VERSION}.${CPACK_PACKAGE_ARCHITECTURE}")
4006-
set(CPACK_ARCHIVE_IGC-OPENCL_FILE_NAME "intel-igc-opencl-${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}-${IGC_API_PATCH_VERSION}.${CPACK_PACKAGE_ARCHITECTURE}")
4007-
set(CPACK_ARCHIVE_IGC-OPENCL-DEVEL_FILE_NAME "intel-igc-opencl-devel-${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}-${IGC_API_PATCH_VERSION}.${CPACK_PACKAGE_ARCHITECTURE}")
3990+
if(DEFINED IGC_PACKAGE_RELEASE)
3991+
set(CPACK_DEBIAN_PACKAGE_RELEASE ${IGC_PACKAGE_RELEASE})
3992+
set(CPACK_RPM_PACKAGE_RELEASE ${IGC_PACKAGE_RELEASE})
3993+
else()
3994+
set(CPACK_DEBIAN_PACKAGE_RELEASE 1)
3995+
set(CPACK_RPM_PACKAGE_RELEASE 1)
3996+
endif()
3997+
3998+
set(CPACK_DEBIAN_IGC-CORE_FILE_NAME "intel-igc-core_${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
3999+
set(CPACK_DEBIAN_IGC-MEDIA_FILE_NAME "intel-igc-media_${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
4000+
set(CPACK_DEBIAN_IGC-MEDIA_PACKAGE_DEPENDS "intel-igc-core(=${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE})")
4001+
set(CPACK_DEBIAN_IGC-OPENCL_FILE_NAME "intel-igc-opencl_${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
4002+
set(CPACK_DEBIAN_IGC-OPENCL_PACKAGE_DEPENDS "intel-igc-core(=${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE})")
4003+
set(CPACK_DEBIAN_IGC-OPENCL-DEVEL_FILE_NAME "intel-igc-opencl-devel_${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
4004+
set(CPACK_DEBIAN_IGC-OPENCL-DEVEL_PACKAGE_DEPENDS "intel-igc-opencl(=${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE})")
4005+
4006+
set(CPACK_RPM_IGC-CORE_FILE_NAME "intel-igc-core-${CPACK_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
4007+
set(CPACK_RPM_IGC-MEDIA_FILE_NAME "intel-igc-media-${CPACK_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
4008+
set(CPACK_RPM_IGC-MEDIA_PACKAGE_REQUIRES "intel-igc-core = ${CPACK_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}")
4009+
set(CPACK_RPM_IGC-OPENCL_FILE_NAME "intel-igc-opencl-${CPACK_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
4010+
set(CPACK_RPM_IGC-OPENCL_PACKAGE_REQUIRES "intel-igc-core = ${CPACK_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}")
4011+
set(CPACK_RPM_IGC-OPENCL-DEVEL_FILE_NAME "intel-igc-opencl-devel-${CPACK_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
4012+
set(CPACK_RPM_IGC-OPENCL-DEVEL_PACKAGE_REQUIRES "intel-igc-opencl = ${CPACK_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}")
4013+
4014+
set(CPACK_ARCHIVE_IGC-CORE_FILE_NAME "intel-igc-core-${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}.${CPACK_PACKAGE_ARCHITECTURE}")
4015+
set(CPACK_ARCHIVE_IGC-MEDIA_FILE_NAME "intel-igc-media-${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}.${CPACK_PACKAGE_ARCHITECTURE}")
4016+
set(CPACK_ARCHIVE_IGC-OPENCL_FILE_NAME "intel-igc-opencl-${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}.${CPACK_PACKAGE_ARCHITECTURE}")
4017+
set(CPACK_ARCHIVE_IGC-OPENCL-DEVEL_FILE_NAME "intel-igc-opencl-devel-${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}.${CPACK_PACKAGE_ARCHITECTURE}")
40084018

40094019
set(CPACK_DEB_COMPONENT_INSTALL ON)
40104020
set(CPACK_RPM_COMPONENT_INSTALL ON)

0 commit comments

Comments
 (0)