From 3744a1c7f99238a4372f384a842b7867fe843d27 Mon Sep 17 00:00:00 2001 From: Diogo Mendes Matsubara Date: Fri, 25 Oct 2024 17:12:34 +0200 Subject: [PATCH] fix: proper conflict resolution --- install/cpack_project_config.cmake | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/install/cpack_project_config.cmake b/install/cpack_project_config.cmake index 8ff371b08..51c220aab 100644 --- a/install/cpack_project_config.cmake +++ b/install/cpack_project_config.cmake @@ -1,30 +1,5 @@ if(CPACK_GENERATOR MATCHES "DEB") # DEB package -<<<<<<< HEAD -<<<<<<< HEAD -||||||| parent of e85200e2 (fix: set debarch according to target not host) - if(NOT DEBARCH) - execute_process( - COMMAND dpkg --print-architecture - OUTPUT_VARIABLE DEBARCH - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - endif() -======= - if(NOT DEBARCH) - set(DEBARCH ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}) - endif() ->>>>>>> e85200e2 (fix: set debarch according to target not host) -||||||| parent of d9032ef3 (add sample toolchains and fix library names) - if(NOT DEBARCH) - execute_process( - COMMAND dpkg --print-architecture - OUTPUT_VARIABLE DEBARCH - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - endif() -======= ->>>>>>> d9032ef3 (add sample toolchains and fix library names) message(STATUS "Configure DEB packaging for Linux ${DEBARCH}") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "ZettaScale Zenoh Team, ") set(CPACK_DEB_COMPONENT_INSTALL ON)