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

Merge remote branch 'remotes/origin/hotfix/ThirdParty_useSystemInstalledPackages'

Browse source 
Conflicts:
	ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec
	ThirdParty/rpmBuild/SPECS/openmpi-1.4.3.spec
This commit is contained in:
Hrvoje Jasak 2010-12-16 22:56:57 +00:00
commit 13cfb416bb
3 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec vendored
View file

@ -157,6 +157,9 @@ Patch0: ParaView-3.8.1.patch_darwin
addCMakeVariable PARAVIEW_EXTRA_INSTALL_RULES_FILE:FILEPATH=%{_topdir}/BUILD/%{name}-%{version}/Applications/ParaView-3.8.1_extra_install_Darwin.cmake addCMakeVariable PARAVIEW_EXTRA_INSTALL_RULES_FILE:FILEPATH=%{_topdir}/BUILD/%{name}-%{version}/Applications/ParaView-3.8.1_extra_install_Darwin.cmake
%endif %endif
# Add the value of _qmakePath for QT_QMAKE_EXECUTABLE
addCMakeVariable QT_QMAKE_EXECUTABLE:FILEPATH=%{_qmakePath}
echo "CMAKE_VARIABLES: $CMAKE_VARIABLES" echo "CMAKE_VARIABLES: $CMAKE_VARIABLES"
mkdir -p ./buildObj mkdir -p ./buildObj
@ -216,11 +219,9 @@ export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview_plugins
# Enable access to the package applications if present # Enable access to the package applications if present
[ -d \$PARAVIEW_BIN_DIR ] && _foamAddPath \$PARAVIEW_BIN_DIR [ -d \$PARAVIEW_BIN_DIR ] && _foamAddPath \$PARAVIEW_BIN_DIR
if [ "$WM_ARCH" == "darwinIntel" ] # Additional binary path if running on Mac OS X
then [ -d \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS ] && _foamAddPath \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS
# Additional binary path is running on Mac OS X
[ -d \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS ] && _foamAddPath \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS
fi
DOT_SH_EOF DOT_SH_EOF
# #
@ -252,7 +253,7 @@ if ( -e \$PARAVIEW_LIB_DIR/paraview-3.8 ) then
endif endif
# Additional binary path is running on Mac OS X # Additional binary path if running on Mac OS X
if ( -e \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS ) then if ( -e \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS ) then
_foamAddPath \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS _foamAddPath \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS
endif endif

12
etc/prefs.csh-EXAMPLE
View file

@ -112,6 +112,18 @@
# So we don't use a variable called QT_SYSTEM, but instead a variable # So we don't use a variable called QT_SYSTEM, but instead a variable
# called QT_THIRD_PARTY in order to override to the ThirdParty QT # called QT_THIRD_PARTY in order to override to the ThirdParty QT
# package. # package.
#
# If you choose to use the system installed version of QT, keep
# the variable QT_THIRD_PARTY commented, and uncomment the initialization
# of the variable QT_DIR and QT_BIN_DIR. Make sure both variables are
# properly initialized.
#
# If you choose instead to use the ThirdParty version of QT, only uncomment
# the variable QT_THIRD_PARTY and set it to 1. Keep the initialization
# of the variables QT_DIR nd QT_BIN_DIR commented. The QT ThirdParty scripts
# will take care of setting the variables QT_DIR and QT_BIN_DIR to the
# proper values.
#
#setenv QT_THIRD_PARTY 1 #setenv QT_THIRD_PARTY 1
#setenv QT_DIR path_to_system_installed_qt #setenv QT_DIR path_to_system_installed_qt
#setenv QT_BIN_DIR $QT_DIR/bin #setenv QT_BIN_DIR $QT_DIR/bin

12
etc/prefs.sh-EXAMPLE
View file

@ -114,6 +114,18 @@ compilerInstall=system
# So we don't use a variable called QT_SYSTEM, but instead a variable # So we don't use a variable called QT_SYSTEM, but instead a variable
# called QT_THIRD_PARTY in order to override to the ThirdParty QT # called QT_THIRD_PARTY in order to override to the ThirdParty QT
# package. # package.
#
# If you choose to use the system installed version of QT, keep
# the variable QT_THIRD_PARTY commented, and uncomment the initialization
# of the variable QT_DIR and QT_BIN_DIR. Make sure both variables are
# properly initialized.
#
# If you choose instead to use the ThirdParty version of QT, only uncomment
# the variable QT_THIRD_PARTY and set it to 1. Keep the initialization
# of the variables QT_DIR nd QT_BIN_DIR commented. The QT ThirdParty scripts
# will take care of setting the variables QT_DIR and QT_BIN_DIR to the
# proper values.
#
#export QT_THIRD_PARTY=1 #export QT_THIRD_PARTY=1
#export QT_DIR=path_to_system_installed_qt #export QT_DIR=path_to_system_installed_qt
#export QT_BIN_DIR=$QT_DIR/bin #export QT_BIN_DIR=$QT_DIR/bin