Skip to content

Commit

Permalink
package.cmake: set CPACK_DEBIAN_PACKAGE_ARCHITECTURE instead of DEB_A…
Browse files Browse the repository at this point in the history
…RCH.
  • Loading branch information
pnx committed Sep 13, 2022
1 parent c325c17 commit acd452e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions package.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ endif()
# Find architecture using dpkg
if (DPKG_FOUND)
execute_process(COMMAND bash -c "${DPKG_FOUND} --print-architecture"
OUTPUT_VARIABLE DEB_ARCH
OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
OUTPUT_STRIP_TRAILING_WHITESPACE)
else()
set(DEB_ARCH "${CMAKE_SYSTEM_PROCESSOR}")
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
endif()
string(REGEX REPLACE "^${CMAKE_PROJECT_NAME}-(.*)$" "${CMAKE_PROJECT_NAME}_\\1_${DEB_ARCH}" CPACK_DEBIAN_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}")
string(REGEX REPLACE "^${CMAKE_PROJECT_NAME}-(.*)$" "${CMAKE_PROJECT_NAME}_\\1_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}" CPACK_DEBIAN_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}")

string(APPEND CPACK_PACKAGE_FILE_NAME "-${CMAKE_SYSTEM_PROCESSOR}")

Expand Down

0 comments on commit acd452e

Please sign in to comment.