Skip to content
Snippets Groups Projects
Commit 5a570d4c authored by Administrator's avatar Administrator Committed by Florian Uhlig
Browse files

Reenable tsclient on arm

After the latest changes to flesnet it is possible to also build the tsclient
on arm64.
parent 58c7c7ed
No related branches found
No related tags found
1 merge request!1645Reenable tsclient on arm
Pipeline #27057 passed
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment