From 54b3aadcba120dd1e28f37878b1c8415cc3f1877 Mon Sep 17 00:00:00 2001 From: Pavel Kalian Date: Mon, 19 Aug 2024 10:36:20 -0300 Subject: [PATCH] Make libdnet build architecture aware on macOS --- libs/libdnet/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/libdnet/CMakeLists.txt b/libs/libdnet/CMakeLists.txt index 6718fa99a9..eb12a895d1 100644 --- a/libs/libdnet/CMakeLists.txt +++ b/libs/libdnet/CMakeLists.txt @@ -44,6 +44,13 @@ else () endif () include(ExternalProject) set(LIBDNET_SRC ${CMAKE_BINARY_DIR}/libdnet) + if (APPLE) + if (DEFINED CMAKE_OSX_ARCHITECTURES AND NOT CMAKE_OSX_ARCHITECTURES STREQUAL "") + #list(JOIN CMAKE_OSX_ARCHITECTURES ";" DNET_ARCHS) + string(REPLACE " " ";" DNET_ARCHS "${CMAKE_OSX_ARCHITECTURES}") + set(CMAKE_ADDITIONAL_PARAMS "-DCMAKE_OSX_ARCHITECTURES='${DNET_ARCHS}'") + endif () + endif () ExternalProject_Add( libdnet @@ -51,7 +58,7 @@ else () GIT_TAG "libdnet-1.18.0" UPDATE_COMMAND "" - CMAKE_ARGS -DCMAKE_INSTALL_LIBDIR=/lib -DCMAKE_INSTALL_INCLUDEDIR=/include + CMAKE_ARGS -DCMAKE_INSTALL_LIBDIR=/lib -DCMAKE_INSTALL_INCLUDEDIR=/include ${CMAKE_ADDITIONAL_PARAMS} SOURCE_DIR "${LIBDNET_SRC}" TEST_COMMAND "" INSTALL_COMMAND make DESTDIR=${LIBDNET_SRC}/installed install