Skip to content

Commit 57589be

Browse files
amielczaigcbot
authored andcommitted
Change version string based on build type
Change version string based on build type
1 parent 4af024f commit 57589be

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

IGC/CMakeLists.txt

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2269,22 +2269,27 @@ if(UNIX)
22692269
set(CPACK_PACKAGE_VERSION_MINOR ${IGC_API_MINOR_VERSION})
22702270
set(CPACK_PACKAGE_VERSION_PATCH ${IGC_API_PATCH_VERSION})
22712271
set(CPACK_PACKAGE_VERSION_BUILD ${IGC_BUILD_METADATA})
2272-
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
2273-
set(PACKAGE_VERSION_WTH_METADATA "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}+${CPACK_PACKAGE_VERSION_BUILD}")
22742272

2275-
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${IGC_INSTALL_TIME_ROOT_DIR})
2276-
set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "postinst;postrm")
2277-
if(DEFINED IGC_BUILD_METADATA)
2278-
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Intel(R) Graphics Compiler for OpenCL(TM)\nBase revision: ${IGC_BUILD_METADATA}")
2279-
set(CPACK_RPM_PACKAGE_DESCRIPTION "Intel(R) Graphics Compiler for OpenCL(TM)\nBase revision: ${IGC_BUILD_METADATA}")
2273+
# Check if current build is a release build
2274+
#
2275+
# If build is a release build the version string will be MAJOR.MINOR.PATCH+RELEASE_METADATA
2276+
# Else the version string becomes MAJOR.MINOR.PATCH-dev.BUILD_METADATA
2277+
2278+
if(DEFINED IGC_RELEASE_METADATA)
2279+
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
2280+
set(PACKAGE_VERSION_WTH_METADATA "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}+${IGC_RELEASE_METADATA}")
22802281
else()
2281-
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Intel(R) Graphics Compiler for OpenCL(TM)")
2282-
set(CPACK_RPM_PACKAGE_DESCRIPTION "Intel(R) Graphics Compiler for OpenCL(TM)")
2282+
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-dev.${CPACK_PACKAGE_VERSION_BUILD}")
2283+
set(PACKAGE_VERSION_WTH_METADATA "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-dev.${CPACK_PACKAGE_VERSION_BUILD}")
22832284
endif()
2285+
2286+
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${IGC_INSTALL_TIME_ROOT_DIR})
2287+
set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "postinst;postrm")
2288+
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Intel(R) Graphics Compiler for OpenCL(TM)\nBase revision: ${IGC_BUILD_METADATA+IGC_RELEASE_METADATA}")
2289+
set(CPACK_RPM_PACKAGE_DESCRIPTION "Intel(R) Graphics Compiler for OpenCL(TM)\nBase revision: ${IGC_BUILD_METADATA+IGC_RELEASE_METADATA}")
22842290
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
22852291
set(CPACK_RPM_PACKAGE_RELOCATABLE TRUE)
22862292

2287-
22882293
set(CPACK_DEBIAN_IGC-CORE_FILE_NAME "intel-igc-core-2_${PACKAGE_VERSION_WTH_METADATA}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
22892294
set(CPACK_DEBIAN_IGC-CORE_PACKAGE_NAME "intel-igc-core-2")
22902295
set(CPACK_DEBIAN_IGC-OPENCL_FILE_NAME "intel-igc-opencl-2_${PACKAGE_VERSION_WTH_METADATA}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")

0 commit comments

Comments
 (0)