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
4d69cd07
Commit
4d69cd07
authored
7 years ago
by
Lars Bilke
Committed by
Dmitri Naumov
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[Conan] Use VTK 8.1.0
parent
f0741aa8
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scripts/cmake/ConanSetup.cmake
+6
-2
6 additions, 2 deletions
scripts/cmake/ConanSetup.cmake
with
6 additions
and
2 deletions
scripts/cmake/ConanSetup.cmake
+
6
−
2
View file @
4d69cd07
...
...
@@ -18,7 +18,7 @@ include(${PROJECT_SOURCE_DIR}/scripts/cmake/conan/conan.cmake)
set
(
CONAN_REQUIRES
Boost/1.64.0@conan/stable
Eigen3/3.2.9@bilke/stable
VTK/
7
.1.0@bilke/
stable
VTK/
8
.1.0@bilke/
testing
CACHE INTERNAL
""
)
...
...
@@ -28,7 +28,7 @@ set(CONAN_OPTIONS
CACHE INTERNAL
""
)
if
(
LINUX
AND BUILD_SHARED_LIBS
)
if
(
(
UNIX AND NOT APPLE
)
AND BUILD_SHARED_LIBS
)
set
(
CONAN_OPTIONS
${
CONAN_OPTIONS
}
VTK:fPIC=True
)
endif
()
...
...
@@ -50,6 +50,10 @@ if(OGS_BUILD_GUI)
libgeotiff/1.4.2@bilke/stable
Qt/5.11@bincrafters/stable
)
set
(
CONAN_OPTIONS
${
CONAN_OPTIONS
}
VTK:qt=True
)
if
(
UNIX AND NOT APPLE
)
set
(
CONAN_OPTIONS
${
CONAN_OPTIONS
}
VTK:x11=True
)
endif
()
endif
()
# Find Conan and do version check
...
...
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