Skip to content

Commit

Permalink
cmake: Improve CPack settings. Fixes .deb package creation.
Browse files Browse the repository at this point in the history
Also make some cosmetic improvements.
  • Loading branch information
GArik authored and SimonKagstrom committed Dec 26, 2010
1 parent 073a67e commit 515476d
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 11 deletions.
10 changes: 6 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ cmake_minimum_required (VERSION 2.6)
# project name and version
# ====================================
project (kcov)
set (PACKAGE_VERSION_MAJOR 4)
set (PACKAGE_VERSION_MINOR 0)
set (PACKAGE_VERSION_PATCH 0)
set (PROJECT_VERSION_MAJOR 4)
set (PROJECT_VERSION_MINOR 0)
set (PROJECT_VERSION_PATCH 0)
set (PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")


if(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE debug)
set (CMAKE_BUILD_TYPE Debug)
endif(NOT CMAKE_BUILD_TYPE)

# ====================================
Expand Down
17 changes: 10 additions & 7 deletions CPack.local.cmake
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
# ====================================
# cpack settings
# ====================================
set (CPACK_PACKAGE_VERSION_MAJOR ${PACKAGE_VERSION_MAJOR})
set (CPACK_PACKAGE_VERSION_MINOR ${PACKAGE_VERSION_MINOR})
set (CPACK_PACKAGE_VERSION_PATCH ${PACKAGE_VERSION_PATCH})
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Kcov is a code coverage tester based on Bcov")
set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README")
set (CPACK_PACKAGE_VENDOR "Simon Kagstrom <[email protected]>")
set (CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
set (CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
set (CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Code coverage tester based on Bcov")
set (CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README")
set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
set (CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README")
set (CPACK_PACKAGE_VENDOR "Simon Kagstrom")
set (CPACK_PACKAGE_CONTACT "Simon Kagstrom <[email protected]>")
set (CPACK_STRIP_FILES TRUE)
set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}")
set (CPACK_SOURCE_IGNORE_FILES
/Debug/ /Release/ /build/
/.git/ /.gitignore
Expand Down

0 comments on commit 515476d

Please sign in to comment.