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
wenqing
ogs
Commits
fcdeb666
Verified
Commit
fcdeb666
authored
4 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[CMake] Enforce conan supplied mfront.
Fixes
#3034
.
parent
f75fdf23
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
CMakeLists.txt
+6
-0
6 additions, 0 deletions
CMakeLists.txt
scripts/cmake/Find.cmake
+3
-0
3 additions, 0 deletions
scripts/cmake/Find.cmake
with
9 additions
and
0 deletions
CMakeLists.txt
+
6
−
0
View file @
fcdeb666
...
...
@@ -263,6 +263,12 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/ThirdParty/vtkdiff/CMakeLists.txt AND BUILD_TEST
install
(
PROGRAMS $<TARGET_FILE:vtkdiff> DESTINATION bin COMPONENT ogs_extras
)
endif
()
# Correct tfel paths (they seem to be hard-coded to /usr/local/tfel/...)
if
(
OGS_USE_MFRONT AND OGS_USE_CONAN
)
set
(
TFEL_INCLUDE_PATH
"
${
CONAN_TFEL_ROOT
}
/include"
)
set
(
TFEL_LIBRARY_PATH
"
${
CONAN_TFEL_ROOT
}
/lib"
)
endif
()
include
(
scripts/cmake/CheckHeaderCompilation.cmake
)
add_subdirectory
(
Applications
)
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/Find.cmake
+
3
−
0
View file @
fcdeb666
...
...
@@ -90,6 +90,9 @@ if(OGS_USE_MFRONT)
set
(
HAVE_PTHREADS TRUE
)
add_definitions
(
-DHAVE_PTHREADS
)
endif
()
if
(
OGS_USE_CONAN
)
set
(
TFEL_INSTALL_PATH
${
CONAN_TFEL_ROOT
}
CACHE INTERNAL
""
)
endif
()
endif
()
# Do not search for libs if this option is set
...
...
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