Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
ParaView-Superbuild
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
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
Utkarsh Ayachit
ParaView-Superbuild
Commits
5ae20e1b
Commit
5ae20e1b
authored
5 years ago
by
Ben Boeckel
Browse files
Options
Downloads
Patches
Plain Diff
python: support python2 and python3 builds
parent
dcfcfe52
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
+3
-1
3 additions, 1 deletion
CMakeLists.txt
projects/paraview.cmake
+5
-3
5 additions, 3 deletions
projects/paraview.cmake
with
8 additions
and
4 deletions
CMakeLists.txt
+
3
−
1
View file @
5ae20e1b
...
...
@@ -33,7 +33,9 @@ function (superbuild_find_projects var)
cxx11
paraview
paraviewpluginsexternal
python
)
python
python2
python3
)
option
(
USE_NONFREE_COMPONENTS
"Enable the non-free parts of the superbuild"
OFF
)
mark_as_advanced
(
USE_NONFREE_COMPONENTS
)
...
...
This diff is collapsed.
Click to expand it.
projects/paraview.cmake
+
5
−
3
View file @
5ae20e1b
...
...
@@ -104,7 +104,9 @@ if (USE_NONFREE_COMPONENTS AND (WIN32 OR (UNIX AND NOT APPLE)))
endif
()
set
(
PARAVIEW_ENABLE_PYTHON
${
python_enabled
}
)
if
(
python_enabled AND USE_SYSTEM_python AND NOT python_FIND_LIBRARIES
)
if
(
python_enabled AND
((
USE_SYSTEM_python2 AND NOT python2_FIND_LIBRARIES
)
OR
(
USE_SYSTEM_python3 AND NOT python3_FIND_LIBRARIES
)))
set
(
PARAVIEW_ENABLE_PYTHON OFF
)
endif
()
...
...
@@ -143,7 +145,7 @@ superbuild_add_project(paraview
hdf5
DEPENDS_OPTIONAL
cuda boost matplotlib mpi numpy png
python qt5 visitbridge zlib silo las
python
python2 python3
qt5 visitbridge zlib silo las
xdmf3 ospray vrpn vtkm tbb netcdf
nlohmannjson
paraviewgettingstartedguide
...
...
@@ -163,7 +165,7 @@ superbuild_add_project(paraview
-DPARAVIEW_BUILD_QT_GUI:BOOL=
${
qt5_enabled
}
-DPARAVIEW_ENABLE_FFMPEG:BOOL=
${
ffmpeg_enabled
}
-DPARAVIEW_ENABLE_PYTHON:BOOL=
${
PARAVIEW_ENABLE_PYTHON
}
-DPARAVIEW_PYTHON_VERSION:STRING=
2
-DPARAVIEW_PYTHON_VERSION:STRING=
${
python_version
}
-DPARAVIEW_ENABLE_COSMOTOOLS:BOOL=
${
cosmotools_enabled
}
-DPARAVIEW_ENABLE_XDMF3:BOOL=
${
xdmf3_enabled
}
-DPARAVIEW_ENABLE_LAS:BOOL=
${
las_enabled
}
...
...
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