From 5a570d4cbb5354bdf916dc2d291a4ccc99bf1ecd Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Tue, 6 Feb 2024 16:07:36 +0100
Subject: [PATCH] Reenable tsclient on arm
After the latest changes to flesnet it is possible to also build the tsclient
on arm64.
---
external/InstallFlesnet.cmake | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/external/InstallFlesnet.cmake b/external/InstallFlesnet.cmake
index 9effb58bdb..56470c49d7 100644
--- a/external/InstallFlesnet.cmake
+++ b/external/InstallFlesnet.cmake
@@ -40,18 +40,11 @@ else()
set(FLESNET_BUILD_COMMAND "${CMAKE_COMMAND} --build . --target")
endif()
-if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES arm)
- set(FLESNET_MODULES logging monitoring fles_ipc)
- set(FLESNET_BYPRODUCTS
- ${FLESNET_DESTDIR}/src/flesnet-build/lib/fles_ipc/${CMAKE_STATIC_LIBRARY_PREFIX}fles_ipc${CMAKE_STATIC_LIBRARY_SUFFIX}
- )
-else()
- set(FLESNET_MODULES logging monitoring fles_ipc tsclient)
- set(FLESNET_BYPRODUCTS
- ${FLESNET_DESTDIR}/src/flesnet-build/lib/fles_ipc/${CMAKE_STATIC_LIBRARY_PREFIX}fles_ipc${CMAKE_STATIC_LIBRARY_SUFFIX}
- ${FLESNET_BIN_PREFIX}/tsclient
- )
-endif()
+set(FLESNET_MODULES logging monitoring fles_ipc tsclient)
+set(FLESNET_BYPRODUCTS
+ ${FLESNET_DESTDIR}/src/flesnet-build/lib/fles_ipc/${CMAKE_STATIC_LIBRARY_PREFIX}fles_ipc${CMAKE_STATIC_LIBRARY_SUFFIX}
+ ${FLESNET_BIN_PREFIX}/tsclient
+ )
ExternalProject_Add(
flesnet
@@ -69,9 +62,8 @@ ExternalProject_Add(
BUILD_BYPRODUCTS ${FLESNET_BYPRODUCTS}
INSTALL_COMMAND ""
)
-if(NOT CMAKE_HOST_SYSTEM_PROCESSOR MATCHES arm)
- install(PROGRAMS ${FLESNET_BIN_PREFIX}/tsclient TYPE BIN)
-endif()
+
+install(PROGRAMS ${FLESNET_BIN_PREFIX}/tsclient TYPE BIN)
add_library(external::zmq STATIC IMPORTED GLOBAL)
add_dependencies(external::zmq flesnet)
--
GitLab