Skip to content

O
opencv
Commit 5dd76a47 authored by Roman Donchenko's avatar Roman Donchenko Committed by Dikay900
Browse files
Options

Set CPACK_DEBIAN_PACKAGE_ARCHITECTURE instead of CPACK_DEBIAN_ARCHITECTURE 

Because that's the variable actually used by CPack.
parent 2bc44869
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
cmake/OpenCVPackaging.cmake
View file @ 5dd76a47
...@@ -20,21 +20,21 @@ endif(NOT OPENCV_CUSTOM_PACKAGE_INFO) ...@@ -20,21 +20,21 @@ endif(NOT OPENCV_CUSTOM_PACKAGE_INFO)
#arch #arch
if(X86) if(X86)
set(CPACK_DEBIAN_ARCHITECTURE "i386") set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386")
set(CPACK_RPM_PACKAGE_ARCHITECTURE "i686") set(CPACK_RPM_PACKAGE_ARCHITECTURE "i686")
elseif(X86_64) elseif(X86_64)
set(CPACK_DEBIAN_ARCHITECTURE "amd64") set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
set(CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64") set(CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64")
elseif(ARM) elseif(ARM)
set(CPACK_DEBIAN_ARCHITECTURE "armhf") set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "armhf")
set(CPACK_RPM_PACKAGE_ARCHITECTURE "armhf") set(CPACK_RPM_PACKAGE_ARCHITECTURE "armhf")
else() else()
set(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR}) set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
set(CPACK_RPM_PACKAGE_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR}) set(CPACK_RPM_PACKAGE_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
endif() endif()
if(CPACK_GENERATOR STREQUAL "DEB") if(CPACK_GENERATOR STREQUAL "DEB")
set(OPENCV_PACKAGE_ARCH_SUFFIX ${CPACK_DEBIAN_ARCHITECTURE}) set(OPENCV_PACKAGE_ARCH_SUFFIX ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE})
elseif(CPACK_GENERATOR STREQUAL "RPM") elseif(CPACK_GENERATOR STREQUAL "RPM")
set(OPENCV_PACKAGE_ARCH_SUFFIX ${CPACK_RPM_PACKAGE_ARCHITECTURE}) set(OPENCV_PACKAGE_ARCH_SUFFIX ${CPACK_RPM_PACKAGE_ARCHITECTURE})
else() else()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment