Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Spack
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
eic_tools
Spack
Commits
eb420137
Commit
eb420137
authored
7 years ago
by
Adam J. Stewart
Committed by
Massimiliano Culpo
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Remove std_cmake_args from VTK definition (#6856)
parent
697f1061
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
var/spack/repos/builtin/packages/vtk/package.py
+6
-5
6 additions, 5 deletions
var/spack/repos/builtin/packages/vtk/package.py
with
6 additions
and
5 deletions
var/spack/repos/builtin/packages/vtk/package.py
+
6
−
5
View file @
eb420137
...
...
@@ -64,8 +64,7 @@ def cmake_args(self):
qt_ver
=
spec
[
'
qt
'
].
version
.
up_to
(
1
)
qt_bin
=
spec
[
'
qt
'
].
prefix
.
bin
cmake_args
=
std_cmake_args
[:]
cmake_args
.
extend
([
cmake_args
=
[
'
-DBUILD_SHARED_LIBS=ON
'
,
'
-DVTK_RENDERING_BACKEND:STRING={0}
'
.
format
(
opengl_ver
),
'
-DVTK_USE_SYSTEM_HDF5=ON
'
,
...
...
@@ -86,7 +85,7 @@ def cmake_args(self):
'
-DVTK_QT_VERSION:STRING={0}
'
.
format
(
qt_ver
),
'
-DQT_QMAKE_EXECUTABLE:PATH={0}/qmake
'
.
format
(
qt_bin
),
'
-DVTK_Group_Qt:BOOL=ON
'
,
]
)
]
# NOTE: The following definitions are required in order to allow
# VTK to build with qt~webkit versions (see the documentation for
...
...
@@ -99,7 +98,9 @@ def cmake_args(self):
])
if
spec
.
satisfies
(
'
@:6.1.0
'
):
cmake_args
.
append
(
'
-DCMAKE_C_FLAGS=-DGLX_GLXEXT_LEGACY
'
)
cmake_args
.
append
(
'
-DCMAKE_CXX_FLAGS=-DGLX_GLXEXT_LEGACY
'
)
cmake_args
.
extend
([
'
-DCMAKE_C_FLAGS=-DGLX_GLXEXT_LEGACY
'
,
'
-DCMAKE_CXX_FLAGS=-DGLX_GLXEXT_LEGACY
'
])
return
cmake_args
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