diff options
| author | 刘学利 <[email protected]> | 2021-11-10 17:28:41 +0000 |
|---|---|---|
| committer | 刘学利 <[email protected]> | 2021-11-10 17:28:41 +0000 |
| commit | 7838d6eb7c6cf094dd32942c6c932ed68b7d06d8 (patch) | |
| tree | f0defc887fc291e5b4e48cfd2e5bb8c5538d5e62 | |
| parent | 895e4c08bb169a35bfa9d7a639c7a68a396e9d52 (diff) | |
| parent | 989a6627dc64f182b547de28e804272dd1627177 (diff) | |
Merge branch 'bugfix-build-rpm-error' into 'master'v2.0.0
update CMakeLists.txt, QUIC头文件变更
See merge request MESA_Platform/quic!1
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32f76f0..f65fbb1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,7 +100,7 @@ release_build_debug: PULP3_DIST_NAME: protocol-stable-x86_64.el7 extends: .build_by_travis artifacts: - name: "quic-$CI_COMMIT_REF_NAME-release" + name: "quic-$CI_COMMIT_REF_NAME-debug" paths: - build/*.rpm only: diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ad2ca3..82f8f62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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(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 inc/gquic.h DESTINATION /opt/MESA/include/MESA COMPONENT HEADER) +install(FILES include/quic.h DESTINATION /opt/MESA/include/MESA COMPONENT HEADER) include(Package) |