Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not create a module for cpack #116

Merged
merged 4 commits into from
Sep 21, 2024
Merged

Do not create a module for cpack #116

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2084805
Do not create a module for cpack
bugdea1er Sep 21, 2024
7305c47
Move CPackConfig to cmake/
bugdea1er Sep 21, 2024
2fee999
Fix version variables
bugdea1er Sep 21, 2024
9413510
Merge branch 'main' into cpack-cleanup
bugdea1er Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,6 @@ if(TMP_IS_TOP_LEVEL)
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
COMPONENT Development)

include(TmpCPack)
set(CPACK_PROJECT_CONFIG_FILE "${PROJECT_SOURCE_DIR}/cmake/CPackConfig.cmake")
include(CPack)
endif()
12 changes: 3 additions & 9 deletions cmake/modules/TmpCPack.cmake → cmake/CPackConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,7 @@ set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON)
set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY ">=")
set(CPACK_DEBIAN_DEVELOPMENT_PACKAGE_DEPENDS
"libstdc++-dev, libtmp${PROJECT_VERSION_MAJOR} (= ${PROJECT_VERSION})")
"libstdc++-dev, libtmp${PROJECT_VERSION_MAJOR} (= ${PROJECT_VERSION})")
bugdea1er marked this conversation as resolved.
Show resolved Hide resolved

set(CPACK_DEBIAN_RUNTIME_DESCRIPTION
"Runtime package"
)
set(CPACK_DEBIAN_DEVELOPMENT_DESCRIPTION
"Development package"
)

include(CPack)
set(CPACK_DEBIAN_RUNTIME_DESCRIPTION "Runtime package")
set(CPACK_DEBIAN_DEVELOPMENT_DESCRIPTION "Development package")