Merge branch 'bugfix-build-rpm-error' into 'master'

update CMakeLists.txt, QUIC头文件变更

See merge request MESA_Platform/quic!1
This commit is contained in:
刘学利
2021-11-10 17:28:41 +00:00
2 changed files with 2 additions and 2 deletions

View File

@@ -100,7 +100,7 @@ release_build_debug:
PULP3_DIST_NAME: protocol-stable-x86_64.el7 PULP3_DIST_NAME: protocol-stable-x86_64.el7
extends: .build_by_travis extends: .build_by_travis
artifacts: artifacts:
name: "quic-$CI_COMMIT_REF_NAME-release" name: "quic-$CI_COMMIT_REF_NAME-debug"
paths: paths:
- build/*.rpm - build/*.rpm
only: only:

View File

@@ -58,6 +58,6 @@ set(CPACK_RPM_USER_FILELIST "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/plug/pro
install(TARGETS quic LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/protocol/quic COMPONENT LIBRARIES) install(TARGETS quic LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/protocol/quic COMPONENT LIBRARIES)
install(FILES bin/quic.inf DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/protocol/quic COMPONENT PROFILE) install(FILES bin/quic.inf DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/protocol/quic COMPONENT PROFILE)
install(FILES bin/quic.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/conf/quic COMPONENT PROFILE) install(FILES bin/quic.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/conf/quic COMPONENT PROFILE)
install(FILES inc/gquic.h DESTINATION /opt/MESA/include/MESA COMPONENT HEADER) install(FILES include/quic.h DESTINATION /opt/MESA/include/MESA COMPONENT HEADER)
include(Package) include(Package)