Peter M. Groen / CLI11

Commit b5242611a5dd99624173ba44e76251c14b168a65

Authored by Henry Schreiner
Committed by GitHub
1 parent 9549c628

Minor packaging cleanup

Inline Side-by-side
Showing 1 changed file with 5 additions and 3 deletions
CMakeLists.txt
  View file @b524261
@@ -269,15 +269,17 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND EXISTS "${CMAKE_CURRENT_SOURCE_D @@ -269,15 +269,17 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND EXISTS "${CMAKE_CURRENT_SOURCE_D
269 endif() 269 endif()
270 270
271 # Packaging support 271 # Packaging support
272 -# Packaging support  
273 set(CPACK_PACKAGE_VENDOR "github.com/CLIUtils/CLI11") 272 set(CPACK_PACKAGE_VENDOR "github.com/CLIUtils/CLI11")
274 set(CPACK_PACKAGE_CONTACT "https://${CPACK_PACKAGE_VENDOR}") 273 set(CPACK_PACKAGE_CONTACT "https://${CPACK_PACKAGE_VENDOR}")
275 -set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) 274 +set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) # Automatic in CMake 3.12+
  275 +set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) # Automatic in CMake 3.12+
  276 +set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) # Automatic in CMake 3.12+
276 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Command line parser with simple and intuitive interface") 277 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Command line parser with simple and intuitive interface")
277 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") 278 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
278 set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md") 279 set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
279 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/CLI11.CPack.Description.txt") 280 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/CLI11.CPack.Description.txt")
280 set(CPACK_SOURCE_GENERATOR "TGZ;ZIP") 281 set(CPACK_SOURCE_GENERATOR "TGZ;ZIP")
  282 +
281 # CPack collects *everything* except what's listed here. 283 # CPack collects *everything* except what's listed here.
282 set(CPACK_SOURCE_IGNORE_FILES 284 set(CPACK_SOURCE_IGNORE_FILES
283 /.git 285 /.git
@@ -299,9 +301,9 @@ set(CPACK_SOURCE_IGNORE_FILES @@ -299,9 +301,9 @@ set(CPACK_SOURCE_IGNORE_FILES
299 /.pre-commit.*yaml 301 /.pre-commit.*yaml
300 ) 302 )
301 303
302 -set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})  
303 set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "all") 304 set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "all")
304 set(CPACK_DEBIAN_COMPRESSION_TYPE "xz") 305 set(CPACK_DEBIAN_COMPRESSION_TYPE "xz")
305 set(CPACK_DEBIAN_PACKAGE_NAME "libcli11-dev") 306 set(CPACK_DEBIAN_PACKAGE_NAME "libcli11-dev")
  307 +
306 include(CPack) 308 include(CPack)
307 309