From b06a5736095c2b9c735ea42a64de9c7f3a9191bb Mon Sep 17 00:00:00 2001 From: "xuan_(oliver)__sang" Date: Thu, 28 Jun 2018 16:33:41 +0800 Subject: [PATCH] [Decode] add rpm support(CL#778369) add rpm support Change-Id: I41e132fbce6dafc54cb2baa22606211099309e1a --- CMakeLists.txt | 10 ++++++++-- pack_ext.cmake | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9880c9c2f..4433b885b 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,11 +56,17 @@ endif() include(${CMAKE_CURRENT_LIST_DIR}/pack_ext.cmake OPTIONAL) -set(CPACK_GENERATOR "DEB") +if (NOT MEDIA_PACKING) + set(CPACK_GENERATOR "DEB" "RPM") +else() + set(CPACK_GENERATOR ${MEDIA_PACKAGING}) +endif() set(CPACK_PACKAGE_NAME "intel-media") set(CPACK_PACKAGE_VENDOR "Intel") -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "intel-media deb package for internal usage only") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "intel-media Open Source Driver") set(CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64") +set(CPACK_RPM_PACKAGE_GROUP "System Environment/Libraries") +set(CPACK_RPM_PACKAGE_LICENSE "Intel") if (DEFINED MEDIA_VERSION) string(REPLACE "." ";" MEDIA_VERSION_LIST ${MEDIA_VERSION}) diff --git a/pack_ext.cmake b/pack_ext.cmake index 519aa8de8..051b72fd3 100644 --- a/pack_ext.cmake +++ b/pack_ext.cmake @@ -27,10 +27,14 @@ if (IS_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../libva-install/usr/include) endif() if (IS_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../libva-install/usr/lib) install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../libva-install/usr/lib DESTINATION ${CMAKE_INSTALL_PREFIX} COMPONENT media) +elseif (IS_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../libva-install/usr/lib64) + install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../libva-install/usr/lib64 DESTINATION ${CMAKE_INSTALL_PREFIX} COMPONENT media) endif() if (IS_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../libdrm-install/usr/lib) install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../libdrm-install/usr/lib DESTINATION ${CMAKE_INSTALL_PREFIX} COMPONENT media) +elseif (IS_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../libdrm-install/usr/lib64) + install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../libdrm-install/usr/lib64 DESTINATION ${CMAKE_INSTALL_PREFIX} COMPONENT media) endif() if (IS_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../msdk-install/mediasdk)