Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
Visualization
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
Container registry
Model registry
Operate
Environments
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
Modules
Visualization
Commits
96e5f99b
Commit
96e5f99b
authored
8 years ago
by
Mark Olesen
Browse files
Options
Downloads
Patches
Plain Diff
BUG: paraview plugin not being built in merged version (closes #258)
parent
91cfaa52
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/paraview-plugins/PV3Readers/Allwmake
+10
-16
10 additions, 16 deletions
src/paraview-plugins/PV3Readers/Allwmake
src/paraview-plugins/PVReaders/Allwmake
+11
-17
11 additions, 17 deletions
src/paraview-plugins/PVReaders/Allwmake
with
21 additions
and
33 deletions
src/paraview-plugins/PV3Readers/Allwmake
+
10
−
16
View file @
96e5f99b
...
@@ -41,31 +41,25 @@ canBuildPlugin()
...
@@ -41,31 +41,25 @@ canBuildPlugin()
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
# major version as per paraview include directory:
# Eg, "PREFIX/include/paraview-3.4" -> "3.4"
major
=
"
${
ParaView_INCLUDE_DIR
##*-
}
"
case
"
$
ParaView_VERSION
"
in
case
"
$
major
"
in
3
*
)
3
.[0-9]
*
)
if
canBuildPlugin
if
canBuildPlugin
then
then
[
-n
"
$PV_PLUGIN_PATH
"
]
||
{
(
echo
"
$0
: PV_PLUGIN_PATH not valid - it is unset"
exit
1
}
# Ensure CMake gets the correct C/C++ compilers
[
-n
"
$WM_CC
"
]
&&
export
CC
=
"
$WM_CC
"
[
-n
"
$WM_CXX
"
]
&&
export
CXX
=
"
$WM_CXX
"
wmake
$targetType
vtkPV3Readers
wmake
$targetType
vtkPV3Readers
PV3blockMeshReader/Allwmake
$targetType
$*
PV3blockMeshReader/Allwmake
$*
PV3FoamReader/Allwmake
$targetType
$*
PV3FoamReader/Allwmake
$*
else
)
echo
"ERROR: ParaView not found in
$ParaView_DIR
"
fi
fi
;;
;;
*
)
*
)
echo
echo
echo
"NOTE: skipping build of ParaView V3 plugin(s)"
echo
"NOTE: skipping build of ParaView V3 plugin(s)"
echo
"
different version: P
ara
V
iew
_VERSION=
$ParaView_VERSION
"
echo
"
include directory was for p
ara
v
iew
major version '
${
major
:-
none
}
'
"
echo
echo
;;
;;
esac
esac
...
...
This diff is collapsed.
Click to expand it.
src/paraview-plugins/PVReaders/Allwmake
+
11
−
17
View file @
96e5f99b
...
@@ -42,37 +42,31 @@ canBuildPlugin()
...
@@ -42,37 +42,31 @@ canBuildPlugin()
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
case
"
$ParaView_VERSION
"
in
# major version as per paraview include directory:
4
*
|
5
*
)
# Eg, "PREFIX/include/paraview-5.0" -> "5.0"
major
=
"
${
ParaView_INCLUDE_DIR
##*-
}
"
case
"
$major
"
in
[
45].[0-9]
*
)
if
canBuildPlugin
if
canBuildPlugin
then
then
[
-n
"
$PV_PLUGIN_PATH
"
]
||
{
(
echo
"
$0
: PV_PLUGIN_PATH not valid - it is unset"
exit
1
}
# ensure CMake gets the correct C/C++ compilers
[
-n
"
$WM_CC
"
]
&&
export
CC
=
"
$WM_CC
"
[
-n
"
$WM_CXX
"
]
&&
export
CXX
=
"
$WM_CXX
"
wmake
$targetType
vtkPVReaders
wmake
$targetType
vtkPVReaders
PVblockMeshReader/Allwmake
$targetType
$*
PVblockMeshReader/Allwmake
$*
PVFoamReader/Allwmake
$targetType
$*
PVFoamReader/Allwmake
$*
# Dummy directory to trigger proper 'wclean all' behaviour
# Dummy directory to trigger proper 'wclean all' behaviour
# - the Allwclean will otherwise not be used
# - the Allwclean will otherwise not be used
mkdir
-p
Make
mkdir
-p
Make
else
)
echo
"ERROR: ParaView not found in
$ParaView_DIR
"
fi
fi
;;
;;
*
)
*
)
echo
echo
echo
"NOTE: skipping build of ParaView plugin(s)"
echo
"NOTE: skipping build of ParaView plugin(s)"
echo
"
different version: P
ara
V
iew
_VERSION=
$ParaView_VERSION
"
echo
"
include directory was for p
ara
v
iew
major version '
${
major
:-
none
}
'
"
echo
echo
;;
;;
esac
esac
#------------------------------------------------------------------------------
#------------------------------------------------------------------------------
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