Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
ControlSystemAdapter-DoocsAdapter
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
ChimeraTK Mirror
ControlSystemAdapter-DoocsAdapter
Commits
03da7df8
Unverified
Commit
03da7df8
authored
1 year ago
by
Martin Christoph Hierholzer
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #107 from ChimeraTK/update-project-template
update project template
parents
ef273a3b
d4601224
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/add_dependency.cmake
+9
-1
9 additions, 1 deletion
cmake/add_dependency.cmake
cmake/set_control_system_adapter.cmake
+6
-2
6 additions, 2 deletions
cmake/set_control_system_adapter.cmake
with
15 additions
and
3 deletions
cmake/add_dependency.cmake
+
9
−
1
View file @
03da7df8
...
...
@@ -54,7 +54,7 @@ FUNCTION(add_dependency dependency_project_name required_version)
ENDFUNCTION
(
add_dependency
)
# make sure that cmake finds modules provided by project-template.
# since with new cmake concept for imported targets, dependencies also search for implicit dependencies,
# since with new cmake concept for imported targets, dependencies also search for implicit dependencies,
# all projects using add_dependency also require this module path.
set
(
_projectTemplateModulePath
${
CMAKE_SOURCE_DIR
}
/cmake/Modules
)
# substr search is better than regex if paths have special characters
...
...
@@ -62,3 +62,11 @@ string(FIND ":${CMAKE_MODULE_PATH}:" ":${_projectTemplateModulePath}:" _projectT
if
(
${
_projectTemplateModulePathPos
}
EQUAL -1
)
list
(
APPEND CMAKE_MODULE_PATH
"
${
_projectTemplateModulePath
}
"
)
endif
()
message
(
WARNING
"
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
You are using add_dependency() in your CMakeLists.txt which is deprecated and may lead to subtle problems. Please follow the project-template migration guide to cmake imported targets.
Furhter processing is delayed by 5 seconds.
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
"
)
execute_process
(
COMMAND
${
CMAKE_COMMAND
}
-E sleep 5.0
)
This diff is collapsed.
Click to expand it.
cmake/set_control_system_adapter.cmake
+
6
−
2
View file @
03da7df8
...
...
@@ -29,18 +29,22 @@
if
(
ADAPTER STREQUAL
"OPCUA"
)
message
(
"Building against the OPC UA ControlSystemAdater"
)
find_package
(
ChimeraTK-ControlSystemAdapter-OPCUAAdapter 03.00 REQUIRED
)
set_target_properties
(
ChimeraTK::ChimeraTK-ControlSystemAdapter-OPCUAAdapter PROPERTIES IMPORTED_GLOBAL TRUE
)
add_library
(
ChimeraTK::SelectedAdapter ALIAS ChimeraTK::ChimeraTK-ControlSystemAdapter-OPCUAAdapter
)
elseif
(
ADAPTER STREQUAL
"DOOCS"
)
message
(
"Building against the DOOCS ControlSystemAdater"
)
find_package
(
ChimeraTK-ControlSystemAdapter-DoocsAdapter 01.08 REQUIRED
)
set_target_properties
(
ChimeraTK::ChimeraTK-ControlSystemAdapter-DoocsAdapter PROPERTIES IMPORTED_GLOBAL TRUE
)
add_library
(
ChimeraTK::SelectedAdapter ALIAS ChimeraTK::ChimeraTK-ControlSystemAdapter-DoocsAdapter
)
elseif
(
ADAPTER STREQUAL
"EPICSIOC"
)
message
(
"Building against the EPICS IOC ControlSystemAdater"
)
find_package
(
ChimeraTK-ControlSystemAdapter-EPICS-IOC-Adapter 02.00 REQUIRED
)
find_package
(
ChimeraTK-ControlSystemAdapter-EPICS-IOC-Adapter 02.01 REQUIRED
)
set_target_properties
(
ChimeraTK::ChimeraTK-ControlSystemAdapter-EPICS-IOC-Adapter PROPERTIES IMPORTED_GLOBAL TRUE
)
add_library
(
ChimeraTK::SelectedAdapter ALIAS ChimeraTK::ChimeraTK-ControlSystemAdapter-EPICS-IOC-Adapter
)
elseif
(
ADAPTER STREQUAL
"EPICS7IOC"
)
message
(
"Building against the EPICS ver. 7.0 IOC ControlSystemAdater"
)
find_package
(
ChimeraTK-ControlSystemAdapter-EPICS7-IOC-Adapter 02.00 REQUIRED
)
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
)
else
()
message
(
FATAL_ERROR
"Please select your ControlSystemAdapter to use by passing to the cmake command line:
\n
"
...
...
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