Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TEC Server Config
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
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
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MSK-SW
Infrastructure and Support
TEC
TEC Server Config
Commits
14dec6fb
Commit
14dec6fb
authored
10 months ago
by
Jens Georg
Browse files
Options
Downloads
Plain Diff
Merge branch 'update-project-template' into 'master'
update project template See merge request
!12
parents
de25959f
225e4691
No related branches found
Branches containing commit
Tags
08.00.01
Tags containing commit
1 merge request
!12
update project template
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/Doxyfile.in
+0
-13
0 additions, 13 deletions
cmake/Doxyfile.in
cmake/set_control_system_adapter.cmake
+7
-1
7 additions, 1 deletion
cmake/set_control_system_adapter.cmake
with
7 additions
and
14 deletions
cmake/Doxyfile.in
+
0
−
13
View file @
14dec6fb
...
...
@@ -263,12 +263,6 @@ TAB_SIZE = 8
ALIASES =
# This tag can be used to specify a number of word-keyword mappings (TCL only).
# A mapping has the form "name=value". For example adding "class=itcl::class"
# will allow you to use the command class in the itcl::class meaning.
TCL_SUBST =
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
...
...
@@ -1140,13 +1134,6 @@ CLANG_DATABASE_PATH =
ALPHABETICAL_INDEX = YES
# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
# which the alphabetical index list will be split.
# Minimum value: 1, maximum value: 20, default value: 5.
# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
COLS_IN_ALPHA_INDEX = 5
# In case all classes in a project start with a common prefix, all classes will
# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
# can be used to specify a prefix (or a list of prefixes) that should be ignored
...
...
This diff is collapsed.
Click to expand it.
cmake/set_control_system_adapter.cmake
+
7
−
1
View file @
14dec6fb
...
...
@@ -46,10 +46,16 @@ elseif(ADAPTER STREQUAL "EPICS7IOC")
find_package
(
ChimeraTK-ControlSystemAdapter-EPICS7-IOC-Adapter 02.01 REQUIRED
)
set_target_properties
(
ChimeraTK::ChimeraTK-ControlSystemAdapter-EPICS7-IOC-Adapter PROPERTIES IMPORTED_GLOBAL TRUE
)
add_library
(
ChimeraTK::SelectedAdapter ALIAS ChimeraTK::ChimeraTK-ControlSystemAdapter-EPICS7-IOC-Adapter
)
elseif
(
ADAPTER STREQUAL
"TANGO"
)
message
(
"Building against the Tango ControlSystemAdater"
)
find_package
(
ChimeraTK-ControlSystemAdapter-TangoAdapter 01.00 REQUIRED
)
set_target_properties
(
ChimeraTK::ChimeraTK-ControlSystemAdapter-TangoAdapter PROPERTIES IMPORTED_GLOBAL TRUE
)
add_library
(
ChimeraTK::SelectedAdapter ALIAS ChimeraTK::ChimeraTK-ControlSystemAdapter-TangoAdapter
)
else
()
message
(
FATAL_ERROR
"Please select your ControlSystemAdapter to use by passing to the cmake command line:
\n
"
" -DADAPTER=DOOCS to build a DOOCS server
\n
"
" -DADAPTER=OPCUA to build an OPC UA server
\n
"
" -DADAPTER=EPICSIOC to build an EPICS ver. 3.16 IOC
\n
"
" -DADAPTER=EPICS7IOC to build an EPICS ver. 7.0 IOC"
)
" -DADAPTER=EPICS7IOC to build an EPICS ver. 7.0 IOC
\n
"
" -DADAPTER=TANGO to build a Tango device server"
)
endif
()
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