Skip to content

Commit 49497e5

Browse files
paigealegfxbot
paigeale
authored and
gfxbot
committed
Ensuring one major/minor/package version for all .so and .pc files
Change-Id: Id97940d77bf7566bd2845e572eeeb60f6abd9492
1 parent 5faeeec commit 49497e5

File tree

1 file changed

+21
-31
lines changed

1 file changed

+21
-31
lines changed

‎IGC/CMakeLists.txt‎

Lines changed: 21 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1870,16 +1870,6 @@ endfunction()
18701870
# Default languages: C, C++.
18711871
project(IGC)
18721872

1873-
if(NOT DEFINED MAJOR_VERSION)
1874-
set(MAJOR_VERSION 0)
1875-
endif()
1876-
if(NOT DEFINED MINOR_VERSION)
1877-
set(MINOR_VERSION 1)
1878-
endif()
1879-
if(NOT DEFINED PATCH_VERSION)
1880-
set(PATCH_VERSION 0)
1881-
endif()
1882-
18831873
# IGC project available configuration types:
18841874
# One standard configuration + "ReleaseInternal" custom configurations.
18851875
set(IGC_CMAKE_CONFIGURATION_TYPES
@@ -3956,34 +3946,34 @@ if(UNIX)
39563946
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "intel")
39573947
set(CPACK_PACKAGE_ARCHITECTURE "x86_64")
39583948
set(CPACK_PACKAGE_NAME "intel")
3959-
set(CPACK_PACKAGE_VERSION_MAJOR ${MAJOR_VERSION})
3960-
set(CPACK_PACKAGE_VERSION_MINOR ${MINOR_VERSION})
3961-
set(CPACK_PACKAGE_VERSION_PATCH ${PATCH_VERSION})
3949+
set(CPACK_PACKAGE_VERSION_MAJOR ${IGC_API_MAJOR_VERSION})
3950+
set(CPACK_PACKAGE_VERSION_MINOR ${IGC_API_MINOR_VERSION})
3951+
set(CPACK_PACKAGE_VERSION_PATCH ${IGC_API_PATCH_VERSION})
39623952
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${IGC_INSTALL_TIME_ROOT_DIR})
39633953
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Intel(R) Graphics Compiler for OpenCL(TM)")
39643954
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
39653955
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
39663956
set(CPACK_RPM_PACKAGE_RELOCATABLE TRUE)
39673957
set(CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64")
39683958

3969-
set(CPACK_DEBIAN_IGC-CORE_FILE_NAME "intel-igc-core_${MAJOR_VERSION}.${MINOR_VERSION}-${PATCH_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
3970-
set(CPACK_DEBIAN_IGC-MEDIA_FILE_NAME "intel-igc-media_${MAJOR_VERSION}.${MINOR_VERSION}-${PATCH_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
3971-
set(CPACK_DEBIAN_IGC-MEDIA_PACKAGE_DEPENDS "intel-igc-core(=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION})")
3972-
set(CPACK_DEBIAN_IGC-OPENCL_FILE_NAME "intel-igc-opencl_${MAJOR_VERSION}.${MINOR_VERSION}-${PATCH_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
3973-
set(CPACK_DEBIAN_IGC-OPENCL_PACKAGE_DEPENDS "intel-igc-core(=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION})")
3974-
set(CPACK_DEBIAN_IGC-OPENCL-DEVEL_FILE_NAME "intel-igc-opencl-devel_${MAJOR_VERSION}.${MINOR_VERSION}-${PATCH_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
3975-
set(CPACK_DEBIAN_IGC-OPENCL-DEVEL_PACKAGE_DEPENDS "intel-igc-opencl(=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION})")
3976-
set(CPACK_RPM_IGC-CORE_FILE_NAME "intel-igc-core-${MAJOR_VERSION}.${MINOR_VERSION}-${PATCH_VERSION}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
3977-
set(CPACK_RPM_IGC-MEDIA_FILE_NAME "intel-igc-media-${MAJOR_VERSION}.${MINOR_VERSION}-${PATCH_VERSION}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
3978-
set(CPACK_RPM_IGC-MEDIA_PACKAGE_REQUIRES "intel-igc-core(=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION})")
3979-
set(CPACK_RPM_IGC-OPENCL_FILE_NAME "intel-igc-opencl-${MAJOR_VERSION}.${MINOR_VERSION}-${PATCH_VERSION}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
3980-
set(CPACK_RPM_IGC-OPENCL_PACKAGE_REQUIRES "intel-igc-core(=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION})")
3981-
set(CPACK_RPM_IGC-OPENCL-DEVEL_FILE_NAME "intel-igc-opencl-devel-${MAJOR_VERSION}.${MINOR_VERSION}-${PATCH_VERSION}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
3982-
set(CPACK_RPM_IGC-OPENCL-DEVEL_PACKAGE_REQUIRES "intel-igc-opencl(=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION})")
3983-
set(CPACK_ARCHIVE_IGC-CORE_FILE_NAME "intel-igc-core-${MAJOR_VERSION}.${MINOR_VERSION}-${PATCH_VERSION}.${CPACK_PACKAGE_ARCHITECTURE}")
3984-
set(CPACK_ARCHIVE_IGC-MEDIA_FILE_NAME "intel-igc-media-${MAJOR_VERSION}.${MINOR_VERSION}-${PATCH_VERSION}.${CPACK_PACKAGE_ARCHITECTURE}")
3985-
set(CPACK_ARCHIVE_IGC-OPENCL_FILE_NAME "intel-igc-opencl-${MAJOR_VERSION}.${MINOR_VERSION}-${PATCH_VERSION}.${CPACK_PACKAGE_ARCHITECTURE}")
3986-
set(CPACK_ARCHIVE_IGC-OPENCL-DEVEL_FILE_NAME "intel-igc-opencl-devel-${MAJOR_VERSION}.${MINOR_VERSION}-${PATCH_VERSION}.${CPACK_PACKAGE_ARCHITECTURE}")
3959+
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")
3960+
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")
3961+
set(CPACK_DEBIAN_IGC-MEDIA_PACKAGE_DEPENDS "intel-igc-core(=${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}.${IGC_API_PATCH_VERSION})")
3962+
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")
3963+
set(CPACK_DEBIAN_IGC-OPENCL_PACKAGE_DEPENDS "intel-igc-core(=${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}.${IGC_API_PATCH_VERSION})")
3964+
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")
3965+
set(CPACK_DEBIAN_IGC-OPENCL-DEVEL_PACKAGE_DEPENDS "intel-igc-opencl(=${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}.${IGC_API_PATCH_VERSION})")
3966+
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")
3967+
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")
3968+
set(CPACK_RPM_IGC-MEDIA_PACKAGE_REQUIRES "intel-igc-core(=${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}.${IGC_API_PATCH_VERSION})")
3969+
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")
3970+
set(CPACK_RPM_IGC-OPENCL_PACKAGE_REQUIRES "intel-igc-core(=${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}.${IGC_API_PATCH_VERSION})")
3971+
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")
3972+
set(CPACK_RPM_IGC-OPENCL-DEVEL_PACKAGE_REQUIRES "intel-igc-opencl(=${IGC_API_MAJOR_VERSION}.${IGC_API_MINOR_VERSION}.${IGC_API_PATCH_VERSION})")
3973+
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}")
3974+
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}")
3975+
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}")
3976+
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}")
39873977

39883978
set(CPACK_DEB_COMPONENT_INSTALL ON)
39893979
set(CPACK_RPM_COMPONENT_INSTALL ON)

0 commit comments

Comments
 (0)