Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
ParaView-Superbuild
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor 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
Charles Gueunet
ParaView-Superbuild
Commits
b21a71c4
Commit
b21a71c4
authored
5 years ago
by
Ethan Stam
Committed by
Ben Boeckel
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
paraview: backport Python3.4 check for 5.6.1
parent
52efc527
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
projects/paraview.cmake
+5
-0
5 additions, 0 deletions
projects/paraview.cmake
projects/patches/paraview-py34-implib-check.patch
+19
-0
19 additions, 0 deletions
projects/patches/paraview-py34-implib-check.patch
with
24 additions
and
0 deletions
projects/paraview.cmake
+
5
−
0
View file @
b21a71c4
...
...
@@ -260,6 +260,11 @@ if (paraview_SOURCE_SELECTION STREQUAL "5.6.0")
"Fix eye dome lighting in parallel"
)
endif
()
if
(
paraview_SOURCE_SELECTION STREQUAL
"5.6.1"
)
superbuild_apply_patch
(
paraview py34-implib-check
"Fix issue with python 3.4 builds not loading modules"
)
endif
()
if
(
WIN32 AND las_enabled
)
superbuild_append_flags
(
cxx_flags
"-DBOOST_ALL_NO_LIB"
PROJECT_ONLY
)
endif
()
...
...
This diff is collapsed.
Click to expand it.
projects/patches/paraview-py34-implib-check.patch
0 → 100644
+
19
−
0
View file @
b21a71c4
commit 022212953ac07b16e8c3e588423b3be54f9e1715
Author: Cornelis Bockemühl <cornelis@bockemuehl.ch>
Date: Thu Nov 15 23:34:28 2018 +0100
Correcting a python version check
diff --git a/Wrapping/Python/paraview/vtk.py b/Wrapping/Python/paraview/vtk.py
index 054a2d1c88..788d4d9c2a 100644
--- a/Wrapping/Python/paraview/vtk.py
+++ b/Wrapping/Python/paraview/vtk.py
@@ -1,7 +1,7 @@
"""This is the paraview.vtk module."""
import sys
-if sys.version_info < (3,4):
+if sys.version_info <= (3,4):
# imp is deprecated in 3.4
import imp, importlib
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