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
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
Yuhao Liu
ogs
Commits
dd3f9a60
Verified
Commit
dd3f9a60
authored
3 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[conan] Updated tfel to 3.4.
parent
21948de9
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ThirdParty/container-maker
+1
-1
1 addition, 1 deletion
ThirdParty/container-maker
scripts/cmake/ConanSetup.cmake
+1
-1
1 addition, 1 deletion
scripts/cmake/ConanSetup.cmake
with
2 additions
and
2 deletions
container-maker
@
56dcaa7d
Compare
20cc58ea
...
56dcaa7d
Subproject commit
20cc58ea0f939c6b2f5dbea8981c91b49d4ed4f9
Subproject commit
56dcaa7d5c0ea2cda99259aa2a896a7bfaa6f8d0
This diff is collapsed.
Click to expand it.
scripts/cmake/ConanSetup.cmake
+
1
−
1
View file @
dd3f9a60
...
@@ -51,7 +51,7 @@ if(OGS_USE_LIS)
...
@@ -51,7 +51,7 @@ if(OGS_USE_LIS)
endif
()
endif
()
if
(
OGS_USE_MFRONT
)
if
(
OGS_USE_MFRONT
)
set
(
CONAN_REQUIRES
${
CONAN_REQUIRES
}
tfel/3.
3.0
@bilke/testing
)
set
(
CONAN_REQUIRES
${
CONAN_REQUIRES
}
tfel/3.
4
@bilke/testing
)
endif
()
endif
()
if
(
OGS_BUILD_GUI
)
if
(
OGS_BUILD_GUI
)
...
...
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