Skip to content
Snippets Groups Projects

Reenable tsclient on arm

Merged Florian Uhlig requested to merge f.uhlig/cbmroot:build_tsclient_arm into master
1 file
+ 7
15
Compare changes
  • Side-by-side
  • Inline
+ 7
15
@@ -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)
Loading