Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Trip Event Logger 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
Low-Level Radio Frequency
Trip Event Logger
Trip Event Logger Config
Commits
a69c8099
Commit
a69c8099
authored
5 years ago
by
Martin Killenberg
Browse files
Options
Downloads
Patches
Plain Diff
project_template: FindDoocs can now also find libgul14.so
parent
f6b1e297
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmake/Modules/FindDOOCS.cmake
+13
-1
13 additions, 1 deletion
cmake/Modules/FindDOOCS.cmake
with
13 additions
and
1 deletion
cmake/Modules/FindDOOCS.cmake
+
13
−
1
View file @
a69c8099
...
...
@@ -72,7 +72,19 @@ if (";${DOOCS_FIND_COMPONENTS};" MATCHES ";daqreader;")
set
(
DOOCS_LIBRARIES
${
DOOCS_LIBRARIES
}
DAQReader TTF2evutl TTF2XML lzo2 DAQsvrutil
)
endif
()
set
(
DOOCS_LIBRARIES
${
DOOCS_LIBRARIES
}
DOOCSapi nsl dl pthread m rt ldap gul
)
#This is for the transition only. The logic is not bullet proof, but in almost all cases
#if there is libgul14.so, it means DOOCS brought it and needs it.
FIND_LIBRARY
(
LIB_GULOLD libgul.so
${
DOOCS_DIR
}
)
FIND_LIBRARY
(
LIB_GUL14 libgul14.so
${
DOOCS_DIR
}
)
message
(
"LIB_GULOLD
${
LIB_GULOLD
}
, LIB_GUL14
${
LIB_GUL14
}
"
)
if
(
"
${
LIB_GUL14
}
"
MATCHES
"LIB_GUL14-NOTFOUND"
)
set
(
LIB_GUL
"gul"
)
else
()
set
(
LIB_GUL
"gul14"
)
endif
()
set
(
DOOCS_LIBRARIES
${
DOOCS_LIBRARIES
}
DOOCSapi nsl dl pthread m rt ldap
${
LIB_GUL
}
)
message
(
"DOOCS_LIBRARIES
${
DOOCS_LIBRARIES
}
"
)
# now set the required variables based on the determined DOOCS_DIR
set
(
DOOCS_INCLUDE_DIRS
${
DOOCS_DIR
}
/include
)
...
...
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