Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
LFI_3751
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Software Control System
Tango devices
MagneticDevices
LFI_3751
Commits
bc856fbe
Commit
bc856fbe
authored
2 months ago
by
Jade PHAM
Browse files
Options
Downloads
Patches
Plain Diff
Add Ethernet communication mode
parent
c250f570
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+2
-2
2 additions, 2 deletions
CMakeLists.txt
conanfile.py
+2
-2
2 additions, 2 deletions
conanfile.py
pom.xml
+2
-2
2 additions, 2 deletions
pom.xml
with
6 additions
and
6 deletions
CMakeLists.txt
+
2
−
2
View file @
bc856fbe
cmake_minimum_required
(
VERSION 3.15
)
project
(
${
PROJECT_NAME
}
CXX
)
find_package
(
cpp
tango CONFIG REQUIRED
)
find_package
(
yat4
tango
CONFIG REQUIRED
)
find_package
(
crashreporting2 CONFIG
)
add_compile_definitions
(
PROJECT_NAME=
${
PROJECT_NAME
}
)
...
...
@@ -17,7 +17,7 @@ set(includedirs
add_executable
(
${
EXECUTABLE_NAME
}
${
sources
}
)
target_include_directories
(
${
EXECUTABLE_NAME
}
PRIVATE
${
includedirs
}
)
target_link_libraries
(
${
EXECUTABLE_NAME
}
PRIVATE
cpp
tango::
cpp
tango
)
target_link_libraries
(
${
EXECUTABLE_NAME
}
PRIVATE
yat4
tango::
yat4
tango
)
target_link_libraries
(
${
EXECUTABLE_NAME
}
PRIVATE crashreporting2::crashreporting2
)
install
(
TARGETS
${
EXECUTABLE_NAME
}
DESTINATION
"."
RUNTIME DESTINATION bin
)
This diff is collapsed.
Click to expand it.
conanfile.py
+
2
−
2
View file @
bc856fbe
...
...
@@ -3,7 +3,7 @@ from conan import ConanFile
class
LFI_3751Recipe
(
ConanFile
):
name
=
"
lfi_3751
"
executable
=
"
ds_LFI_3751
"
version
=
"
1.1.
5
"
version
=
"
1.1.
6
"
package_type
=
"
application
"
user
=
"
soleil
"
python_requires
=
"
base/[>=1.0]@soleil/stable
"
...
...
@@ -20,6 +20,6 @@ class LFI_3751Recipe(ConanFile):
exports_sources
=
"
CMakeLists.txt
"
,
"
src/*
"
def
requirements
(
self
):
self
.
requires
(
"
cpp
tango/
9.2.5
@soleil/stable
"
)
self
.
requires
(
"
yat4
tango/
[>=1.0]
@soleil/stable
"
)
if
self
.
settings
.
os
==
"
Linux
"
:
self
.
requires
(
"
crashreporting2/[>=1.0]@soleil/stable
"
)
This diff is collapsed.
Click to expand it.
pom.xml
+
2
−
2
View file @
bc856fbe
...
...
@@ -8,7 +8,7 @@
</parent>
<groupId>
fr.soleil.device
</groupId>
<artifactId>
LFI_3751-${aol}-${mode}
</artifactId>
<version>
1.1.6
-SNAPSHOT
</version>
<version>
1.1.6
</version>
<packaging>
nar
</packaging>
<name>
LFI_3751
</name>
<description>
LFI_3751 device
</description>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment