From 3f61b8478427012698a76c0f74dcbed1235f59d3 Mon Sep 17 00:00:00 2001
From: huangxin <huangxin@cmhi.chinamobile.com>
Date: Wed, 11 Jan 2023 17:53:18 +0800
Subject: [PATCH] =?UTF-8?q?OCT=201.=20=E6=9B=B4=E6=96=B0=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=EF=BC=8C=E7=A7=BB=E9=99=A4=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=97=B6=E9=97=B4=E4=B8=AD=E7=9A=84=E5=88=86=E5=89=B2?=
 =?UTF-8?q?=E7=AC=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 srcs/CMakeLists.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcs/CMakeLists.txt b/srcs/CMakeLists.txt
index 52ebf81..63fb87f 100644
--- a/srcs/CMakeLists.txt
+++ b/srcs/CMakeLists.txt
@@ -78,12 +78,13 @@ ADD_CUSTOM_COMMAND(TARGET ${PROJECT_TARGET}
 SET(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install/")
 INSTALL(FILES ../config/vcpe.cfg ../config/vcpe@.service ../config/banner.txt ../config/zlog.conf
         DESTINATION config)
-INSTALL(TARGETS ${PROJECT_TARGET}
-        RUNTIME DESTINATION ./)
+INSTALL(TARGETS ${PROJECT_TARGET} RUNTIME DESTINATION ./)
+INSTALL(DIRECTORY DESTINATION ./log)
 
 SET(CPACK_GENERATOR "TGZ")
 IF ("${VERSION_GIT_HASH_SHORT}" STREQUAL "")
-    SET(CPACK_PACKAGE_FILE_NAME "vCPE-${VCPE_VERSION}-linux-amd64_${VERSION_GIT_TAG}")
+    STRING(REGEX REPLACE "[_:-]" "" VER_STR "${VERSION_GIT_TAG}")
+    SET(CPACK_PACKAGE_FILE_NAME "vCPE-${VCPE_VERSION}-linux-amd64_${VER_STR}")
 ELSE ()
     SET(CPACK_PACKAGE_FILE_NAME "vCPE-${VCPE_VERSION}-linux-amd64_${VERSION_GIT_HASH_SHORT}")
 ENDIF ()