From bcd4bfe3edc966dd2e4421a2ee0b7e411b50f523 Mon Sep 17 00:00:00 2001 From: yangwei Date: Wed, 8 May 2019 15:29:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0demo=E5=8F=AF=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=EF=BC=8C=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E6=A8=A1=E5=9D=97=E5=90=8D=E4=BD=9C=E4=B8=BA=E5=89=8D?= =?UTF-8?q?=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 6 +++--- cmake/Package.cmake | 11 +++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a96711..9b317e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ set(CMAKE_INSTALL_PREFIX /opt/MESA) install(TARGETS ${lib_name}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) install(FILES inc/${lib_name}.h DESTINATION - ${CMAKE_INSTALL_PREFIX}/include/MESA) + ${CMAKE_INSTALL_PREFIX}/include/MESA COMPONENT devel) @@ -57,7 +57,7 @@ file(GLOB DEMO "demo/*.cpp" ) -add_executable(demo ${DEMO}) -target_link_libraries(demo pthread ${lib_name}_static) +add_executable(${lib_name}_demo ${DEMO}) +target_link_libraries(${lib_name}_demo pthread ${lib_name}_static) include(Package) diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 12a55a5..13573d3 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -12,14 +12,21 @@ 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_COMPONENTS_ALL devel) +set(CPACK_RPM_PACKAGE_DEBUG 1) +set(CPACK_RPM_COMPONENT_INSTALL ON) +set(CPACK_RPM_DEVEL_FILE_NAME "${PROJECT_NAME}-devel.rpm") +set(CPACK_RPM_DEVEL_DEBUGINFO_FILE_NAME "${PROJECT_NAME}-devel-debuginfo.rpm") + # 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_DIST ON) +set(CPACK_RPM_DEBUGINFO_PACKAGE ON) + set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}")