支持上传yum源v2.8.4v2.8.3

2 files changed, 44 insertions, 20 deletions

diff --git a/cmake/Package.cmake b/cmake/Package.cmake
index daf7e42..92c344a 100644
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -1,36 +1,54 @@
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CPACK_PACKAGE_NAME "${lib_name}-debug")
+    set(MY_RPM_NAME_PREFIX "${lib_name}-debug")
 else()
-    set(CPACK_PACKAGE_NAME ${lib_name})
+    set(MY_RPM_NAME_PREFIX "${lib_name}")
 endif()
 
-message(STATUS "Package: ${CPACK_PACKAGE_NAME}")
+message(STATUS "Package: ${MY_RPM_NAME_PREFIX}")
 
 set(CPACK_PACKAGE_VECDOR "MESA")
 set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}.${VERSION_BUILD}")
 set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
-
-set(CPACK_RPM_PACKAGE_DEBUG 1)
+set(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_BUILD}")
+execute_process(COMMAND bash -c "echo -ne \"`uname -r | awk -F'.' '{print $5\".\"$6\".\"$7}'`\"" OUTPUT_VARIABLE SYSTEM_VERSION)
 
 # RPM Build
 set(CPACK_GENERATOR "RPM")
-set(CPACK_RPM_AUTO_GENERATED_FILE_NAME ON)
-set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
 set(CPACK_RPM_PACKAGE_VENDOR "MESA")
 set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
-set(CPACK_RPM_PACKAGE_RELEASE_DIST on)
-set(CPACK_RPM_DEBUGINFO_PACKAGE on)
+set(CPACK_RPM_PACKAGE_RELEASE_LIBRARY "on")
+set(CPACK_RPM_DEBUGINFO_PACKAGE "on")
+set(CPACK_RPM_PACKAGE_DEBUG 1)
 
-set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}")
+set(CPACK_RPM_COMPONENT_INSTALL ON)
+set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
+set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP)
+set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop")
+set(CPACK_COMPONENT_LIBRARY_REQUIRED TRUE)
+set(CPACK_COMPONENT_HEADER_REQUIRED TRUE)
 
-# Must uninstall the debug package before install release package
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CPACK_RPM_PACKAGE_CONFLICTS "${lib_name}-debug")
+if(ENABLE_DEVEL)
+	set(CPACK_RPM_FILE_NAME "${MY_RPM_NAME_PREFIX}-devel-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+	set(CPACK_RPM_DEVEL_DEBUGINFO_FILE_NAME "${MY_RPM_NAME_PREFIX}-debuginfo-devel-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+
+	set(CPACK_COMPONENT_LIBRARY_GROUP "devel")
+	set(CPACK_COMPONENT_HEADER_GROUP "devel")
+	set(CPACK_COMPONENTS_ALL LIBRARY HEADER)
 else()
-    set(CPACK_RPM_PACKAGE_CONFLICTS ${lib_name})
-    #    set(CPACK_STRIP_FILES TRUE)
+	set(CPACK_RPM_FILE_NAME "${MY_RPM_NAME_PREFIX}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+	set(CPACK_RPM_LIBRARY_DEBUGINFO_FILE_NAME "${MY_RPM_NAME_PREFIX}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+
+	set(CPACK_COMPONENT_LIBRARY_GROUP "library")
+	set(CPACK_COMPONENTS_ALL LIBRARY)
 endif()
 
+
+set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}")
+
+# Must uninstall the debug package before install release package
+set(CPACK_RPM_PACKAGE_CONFLICTS ${MY_RPM_NAME_PREFIX})
+
+#    set(CPACK_STRIP_FILES TRUE)
 include(CPack)
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index 060a63f..752f20f 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -1,3 +1,4 @@
+
 # Using autorevision.sh to generate version information
 
 set(__SOURCE_AUTORESIVISION ${CMAKE_SOURCE_DIR}/autorevision.sh)
@@ -35,13 +36,18 @@ set(VERSION "${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_PATCH}")
 set(VERSION_BUILD "${VCS_SHORT_HASH}")
 
 # print information
-message(STATUS "VERSION: ${VERSION}-${VERSION_BUILD}")
+message(STATUS "Version: ${VERSION}-${VERSION_BUILD}")
 
-set(GIT_VERSION
-    "${VERSION}-${CMAKE_BUILD_TYPE}-${VERSION_BUILD}-${VCS_BRANCH}-${VCS_DATE}")
+if(NOT DEFINE_GIT_VERSION)
+    option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to OFF" OFF)
 
+set(GIT_VERSION
+    "${VERSION}-${CMAKE_BUILD_TYPE}-${VERSION_BUILD}-${VCS_BRANCH}-${VCS_TAG}-${VCS_DATE}")
 string(REGEX REPLACE "[-:+/\\.]" "_" GIT_VERSION ${GIT_VERSION})
 
-add_definitions(-DGIT_VERSION=${GIT_VERSION})
+if(DEFINE_GIT_VERSION)
+    add_definitions(-DGIT_VERSION=${GIT_VERSION})
+    option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to OFF" ON)
+endif()
 
-message(STATUS "add GIT_VERSION: ${GIT_VERSION}")
+endif()