Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
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
Service Desk
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Chaofan Chen
ogs
Commits
1b35e537
Commit
1b35e537
authored
5 months ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[cmake] Fix for system-installed boost.
parent
9812ed82
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
scripts/cmake/Dependencies.cmake
+19
-11
19 additions, 11 deletions
scripts/cmake/Dependencies.cmake
with
19 additions
and
11 deletions
scripts/cmake/Dependencies.cmake
+
19
−
11
View file @
1b35e537
...
...
@@ -190,20 +190,21 @@ if(OGS_USE_MFRONT)
endif
()
endif
()
# Boost libraries used by ogs, can be linked with Boost::[lib_name]
set
(
BOOST_INCLUDE_LIBRARIES
math
property_tree
algorithm
smart_ptr
tokenizer
assign
dynamic_bitset
range
variant
)
if
(
GUIX_BUILD
)
find_package
(
Boost REQUIRED
)
else
()
# Boost libraries used by ogs, can be linked with Boost::[lib_name]
set
(
BOOST_INCLUDE_LIBRARIES
math
property_tree
algorithm
smart_ptr
tokenizer
assign
dynamic_bitset
range
)
CPMFindPackage
(
NAME Boost
VERSION
${
ogs.minimum_version.boost
}
...
...
@@ -211,6 +212,13 @@ else()
OPTIONS
"BOOST_ENABLE_CMAKE ON"
)
endif
()
if
(
NOT Boost_ADDED
)
# Boost from system found. There are only Boost::headers and Boost::boost
# targets.
foreach
(
lib
${
BOOST_INCLUDE_LIBRARIES
}
)
add_library
(
Boost::
${
lib
}
ALIAS Boost::headers
)
endforeach
()
endif
()
CPMFindPackage
(
NAME LibXml2
...
...
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