Merge branch 'master' into master

This commit is contained in:
Dawid Drozd 2019-04-21 13:14:30 +02:00 committed by GitHub
commit 9fe2ae68f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions

View File

@ -14,6 +14,11 @@ set(CMAKE_CXX_STANDARD 14)
add_subdirectory(lib/) add_subdirectory(lib/)
if(ENABLE_CPACK)
include("lib/cmake/EventBus_CPack.cmake")
enable_cpack("RPM;DEB;TGZ")
endif()
if(ENABLE_TEST) if(ENABLE_TEST)
enable_testing() enable_testing()
add_subdirectory(test/) add_subdirectory(test/)

View File

@ -1,6 +1,7 @@
# CPack Configuration # CPack Configuration
function(enable_cpack) function(enable_cpack generator)
set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
set(CPACK_GENERATOR ${generator})
set(CPACK_PACKAGE_NAME ${PROJECT_NAME}) set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
set(CPACK_PACKAGE_RELEASE 1) set(CPACK_PACKAGE_RELEASE 1)
set(CPACK_PACKAGE_CONTACT "gelldur") set(CPACK_PACKAGE_CONTACT "gelldur")