Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cbmroot
Manage
Activity
Members
Labels
Plan
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Computing
cbmroot
Merge requests
!1645
Reenable tsclient on arm
Code
Review changes
Check out branch
Download
Patches
Plain diff
Expand sidebar
Merged
Reenable tsclient on arm
f.uhlig/cbmroot:build_tsclient_arm
into
master
Overview
1
Commits
1
Pipelines
2
Changes
1
Merged
Florian Uhlig
requested to merge
f.uhlig/cbmroot:build_tsclient_arm
into
master
1 year ago
Overview
1
Commits
1
Pipelines
2
Changes
1
After the latest changes to flesnet it is possible to also build the tsclient on arm64.
0
0
Merge request reports
Compare
master
version 1
ea975e70
1 year ago
master (base)
and
latest version
latest version
5a570d4c
1 commit,
1 year ago
version 1
ea975e70
1 commit,
1 year ago
1 file
+
7
−
15
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
external/InstallFlesnet.cmake
+
7
−
15
View file @ 5a570d4c
Edit in single-file editor
Open in Web IDE
Show full file
@@ -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