Skip to content

Commit 6713a0a

Browse files
committed
[cmake] Don't use CPACK_DEBIAN_PACKAGE_RELEASE, set CPACK_DEBIAN_PACKAGE_VERSION directly.
1 parent 6241845 commit 6713a0a

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

CMakeLists.txt

+8-6
Original file line numberDiff line numberDiff line change
@@ -260,23 +260,24 @@ if("${CMAKE_OS_NAME}" STREQUAL "Debian")
260260
set(CHANGELOG_FOOTER " -- ${CPACK_DEBIAN_PACKAGE_MAINTAINER} ${RFC2822_TIMESTAMP}")
261261
endif()
262262

263-
# Set version release from environment variable
263+
# Guess version release from environment variable
264+
# (usage of CPACK_DEBIAN_PACKAGE_RELEASE breaks ability to set CPACK_DEBIAN_PACKAGE_VERSION properly)
264265
if (NOT "$ENV{PACKAGE_RELEASE}" STREQUAL "")
265-
set(CPACK_DEBIAN_PACKAGE_RELEASE "$ENV{PACKAGE_RELEASE}")
266+
set(PACKAGE_RELEASE "$ENV{PACKAGE_RELEASE}")
266267
else()
267268
if(DATE_CMD)
268269
execute_process(COMMAND ${DATE_CMD} +%Y%m%d OUTPUT_VARIABLE DATE_YMD)
269-
set(CPACK_DEBIAN_PACKAGE_RELEASE ${DATE_YMD})
270+
set(PACKAGE_RELEASE ${DATE_YMD})
270271
else()
271-
set(CPACK_DEBIAN_PACKAGE_RELEASE "1")
272+
set(PACKAGE_RELEASE "1")
272273
endif()
273274
endif()
274275

275276
# Set package version
276-
set(CPACK_DEBIAN_PACKAGE_VERSION ${PROJECT_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}~${DISTRO_CODENAME})
277+
set(CPACK_DEBIAN_PACKAGE_VERSION ${PROJECT_VERSION}-${PACKAGE_RELEASE}~${DISTRO_CODENAME})
277278

278279
# Set debian file name format
279-
set(CPACK_DEBIAN_FILE_NAME "${PACKAGE_NAME}_${PROJECT_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${DISTRO_CODENAME}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
280+
set(CPACK_DEBIAN_FILE_NAME "${PACKAGE_NAME}_${PROJECT_VERSION}-${PACKAGE_RELEASE}_${DISTRO_CODENAME}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
280281

281282
# Set a Debian compliant changelog header
282283
set(CHANGELOG_HEADER "libks (${CPACK_DEBIAN_PACKAGE_VERSION}) ${DISTRO_CODENAME}\; urgency=${CPACK_DEBIAN_PACKAGE_PRIORITY}")
@@ -328,6 +329,7 @@ if("${CMAKE_OS_NAME}" STREQUAL "Debian")
328329
else()
329330
message(WARNING "DEB Generator: Can't find git and/or gzip and/or date in your path. DEB packages will be missing changelog.Debian.gz.")
330331
endif()
332+
331333
endif()
332334

333335
# Enable packaging module

0 commit comments

Comments
 (0)