diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fa31d4..e7d9fe6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,13 +78,13 @@ install (TARGETS ${PROJECT_NAME} DESTINATION bin) SET(CPACK_GENERATOR "DEB") SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Michel Promonet") SET(CPACK_PACKAGE_CONTACT "michel.promonet@free.fr") -SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_PROCESSOR}) +SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}) +set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR}) find_package(Git) if(GIT_FOUND) EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty OUTPUT_VARIABLE VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) STRING(REGEX REPLACE "^v(.*)" "\\1" VERSION ${VERSION}) SET(CPACK_PACKAGE_VERSION "${VERSION}") endif() - INCLUDE(CPack) diff --git a/raspberry.toolchain b/raspberry.toolchain index ac3a3f6..474ef87 100644 --- a/raspberry.toolchain +++ b/raspberry.toolchain @@ -1,5 +1,5 @@ SET(CMAKE_SYSTEM_NAME Linux) -SET(CMAKE_SYSTEM_PROCESSOR arm) +SET(CMAKE_SYSTEM_PROCESSOR armhf) SET(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc) SET(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++) SET(CMAKE_FIND_ROOT_PATH ${PROJECT_SOURCE_DIR}/rootfs)