Skip to content

Commit 25f1ea7

Browse files
committed
cmake: Fix naming scheme for debian packages
Those are only used in case we're building on develop. Signed-off-by: Steffen Jaeckel <[email protected]>
1 parent 7585a6a commit 25f1ea7

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ if(REPO_HAS_TAG EQUAL 0)
231231
set(PACKAGE_NAME_SUFFIX "")
232232
else()
233233
set(PACKAGE_NAME_SUFFIX "-git")
234+
message(STATUS "Use -git suffix")
234235
endif()
235236

236237
# default CPack generators
@@ -250,10 +251,11 @@ set(CPACK_PACKAGE_DIRECTORY ${CMAKE_BINARY_DIR}/packages/${DISTRO_PACK_PATH})
250251
message(STATUS "CPack: packages will be generated under ${CPACK_PACKAGE_DIRECTORY}")
251252
if(BUILD_SHARED_LIBS)
252253
set(CPACK_PACKAGE_NAME "${PROJECT_NAME}${PROJECT_VERSION_MAJOR}")
254+
set(CPACK_DEBIAN_PACKAGE_NAME "${PROJECT_NAME}${PACKAGE_NAME_SUFFIX}${PROJECT_VERSION_MAJOR}")
253255
else()
254256
set(CPACK_PACKAGE_NAME "${PROJECT_NAME}-devel")
257+
set(CPACK_DEBIAN_PACKAGE_NAME "${PROJECT_NAME}${PACKAGE_NAME_SUFFIX}-dev")
255258
endif()
256-
set(CPACK_PACKAGE_NAME "${CPACK_PACKAGE_NAME}${PACKAGE_NAME_SUFFIX}")
257259
set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
258260
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LibTomMath")
259261
set(CPACK_PACKAGE_VENDOR "libtom projects")
@@ -270,7 +272,6 @@ set(CPACK_DEBIAN_PACKAGE_RELEASE ${PACKAGE_RELEASE_VERSION})
270272
if(BUILD_SHARED_LIBS)
271273
set(CPACK_DEBIAN_PACKAGE_SECTION "libs")
272274
else()
273-
set(CPACK_DEBIAN_PACKAGE_NAME "${PROJECT_NAME}-dev")
274275
set(CPACK_DEBIAN_PACKAGE_SECTION "devel")
275276
endif()
276277

0 commit comments

Comments
 (0)