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 ()