exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ThirdParty packages: switching to ParaView-3.14.1

Browse source
This commit is contained in:
Martin Beaudoin 2013-07-04 20:22:32 -04:00
parent 93d7850b6b
commit dacea7a6fb
4 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ThirdParty/AllMake.stage4 vendored
View file

@ -73,8 +73,8 @@ then
if [ -d "$QT_BIN_DIR" -a -r "$QT_BIN_DIR"/qmake ]
then
( rpm_make -p ParaView-3.12.0 -s ParaView-3.12.0.spec -u http://www.paraview.org/files/v3.12/ParaView-3.12.0.tar.gz \
-a --define='_qmakePath $QT_BIN_DIR/qmake'
( rpm_make -p ParaView-3.14.1 -s ParaView-3.14.1.spec -u http://www.paraview.org/files/v3.14/ParaView-3.14.1-Source.tar.gz \
-f --define='_qmakePath $QT_BIN_DIR/qmake'
)
else
echo "WARNING: "

10
ThirdParty/rpmBuild/SPECS/ParaView-3.12.0.spec vendored
View file

@ -168,6 +168,16 @@ Patch1: paraview-gcc47.patch
echo "CMAKE_VARIABLES: $CMAKE_VARIABLES"
%ifos darwin
# For Mac OSX:
# The configuration of Paraview will be using the environment variable MACOSX_DEPLOYMENT_TARGET.
# This variable was initialized using 'sw_vers -productVersion' in etc/bashrc.
# We need to get rid of the revision number from this string. eg turn "10.7.5" into "10.7"
v=( ${MACOSX_DEPLOYMENT_TARGET//./ } )
export MACOSX_DEPLOYMENT_TARGET="${v[0]}.${v[1]}"
echo "Resetting MACOSX_DEPLOYMENT_TARGET to ${MACOSX_DEPLOYMENT_TARGET}"
%endif
mkdir -p ./buildObj
cd ./buildObj

16
ThirdParty/rpmBuild/SPECS/ParaView-3.14.1.spec vendored
View file

@ -157,15 +157,13 @@ Patch2: ParaView-3.14.1.patch_darwin
# start with these general settings
addCMakeVariable VTK_USE_TK:BOOL=OFF
addCMakeVariable PARAVIEW_ENABLE_PYTHON:BOOL=ON
addCMakeVariable BUILD_SHARED_LIBS:BOOL=ON VTK_USE_RPATH:BOOL=OFF
addCMakeVariable PARAVIEW_USE_MPI:BOOL=ON
addCMakeVariable BUILD_SHARED_LIBS:BOOL=ON
addCMakeVariable CMAKE_BUILD_TYPE:STRING=Release
# include development files in "make install"
addCMakeVariable PARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON
# new alternative to "make HTMLDocumentation"
addCMakeVariable PARAVIEW_GENERATE_PROXY_DOCUMENTATION:BOOL=OFF
%ifos darwin
# Additional installation rules for Mac OS X
addCMakeVariable PARAVIEW_EXTRA_INSTALL_RULES_FILE:FILEPATH=%{_topdir}/BUILD/%{name}-%{version}-Source/Applications/ParaView-3.14.1_extra_install_Darwin.cmake
@ -176,6 +174,16 @@ Patch2: ParaView-3.14.1.patch_darwin
echo "CMAKE_VARIABLES: $CMAKE_VARIABLES"
%ifos darwin
# For Mac OSX:
# The configuration of Paraview will be using the environment variable MACOSX_DEPLOYMENT_TARGET.
# This variable was initialized using 'sw_vers -productVersion' in etc/bashrc.
# We need to get rid of the revision number from this string. eg turn "10.7.5" into "10.7"
v=( ${MACOSX_DEPLOYMENT_TARGET//./ } )
export MACOSX_DEPLOYMENT_TARGET="${v[0]}.${v[1]}"
echo "Resetting MACOSX_DEPLOYMENT_TARGET to ${MACOSX_DEPLOYMENT_TARGET}"
%endif
mkdir -p ./buildObj
cd ./buildObj

4
etc/settings.sh
View file

@ -556,8 +556,8 @@ export MPI_BUFFER_SIZE
# Load ParaView
# ~~~~~~~~~~~~~
[ -z "$PARAVIEW_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-3.12.0/platforms/$WM_OPTIONS ] && {
_foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.12.0/platforms/$WM_OPTIONS/etc/ParaView-3.12.0.sh
[ -z "$PARAVIEW_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-3.14.1/platforms/$WM_OPTIONS ] && {
_foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.14.1/platforms/$WM_OPTIONS/etc/ParaView-3.14.1.sh
#[ -z "$PARAVIEW_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1/platforms/$WM_OPTIONS ] && {
# _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1/platforms/$WM_OPTIONS/etc/ParaView-3.8.1.sh
}