ThirdParty packages: Fix typos for some .csh files. Add some comments in the etc/prefs.csh-EXAMPLE and etc/prefs.sh-EXAMPLE fles about QT
This commit is contained in:
parent
c557528639
commit
b9adfe2d6f
4 changed files with 28 additions and 4 deletions
|
@ -233,7 +233,7 @@ cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.cs
|
||||||
setenv PARAVIEW_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
|
setenv PARAVIEW_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
|
||||||
setenv PARAVIEW_BIN_DIR \$PARAVIEW_DIR/bin
|
setenv PARAVIEW_BIN_DIR \$PARAVIEW_DIR/bin
|
||||||
setenv PARAVIEW_LIB_DIR \$PARAVIEW_DIR/lib
|
setenv PARAVIEW_LIB_DIR \$PARAVIEW_DIR/lib
|
||||||
setenv PARAVIEW_INCLUDE_DIR \$PARAVIEW_INCLUDE_DIR/include
|
setenv PARAVIEW_INCLUDE_DIR \$PARAVIEW__DIR/include
|
||||||
|
|
||||||
setenv PARAVIEW_VERSION %{version}
|
setenv PARAVIEW_VERSION %{version}
|
||||||
|
|
||||||
|
|
6
ThirdParty/rpmBuild/SPECS/openmpi-1.4.3.spec
vendored
6
ThirdParty/rpmBuild/SPECS/openmpi-1.4.3.spec
vendored
|
@ -204,8 +204,8 @@ setenv OPENMPI_COMPILE_FLAGS "\`mpicc --showme:compile\`"
|
||||||
setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`"
|
setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`"
|
||||||
|
|
||||||
# Set the OpenFOAM compilation flags
|
# Set the OpenFOAM compilation flags
|
||||||
setenv PINC \$OPENMPI_COMPILE_FLAGS
|
setenv PINC "\$OPENMPI_COMPILE_FLAGS"
|
||||||
setenv PLIBS \$OPENMPI_LINK_FLAGS
|
setenv PLIBS "\$OPENMPI_LINK_FLAGS"
|
||||||
|
|
||||||
|
|
||||||
if (\$?FOAM_VERBOSE && \$?prompt) then
|
if (\$?FOAM_VERBOSE && \$?prompt) then
|
||||||
|
@ -221,7 +221,7 @@ if (\$?FOAM_VERBOSE && \$?prompt) then
|
||||||
echo " OPAL_PREFIX : \$OPAL_PREFIX"
|
echo " OPAL_PREFIX : \$OPAL_PREFIX"
|
||||||
echo " PINC : \$PINC"
|
echo " PINC : \$PINC"
|
||||||
echo " PLIBS : \$PLIBS"
|
echo " PLIBS : \$PLIBS"
|
||||||
fi
|
endif
|
||||||
DOT_CSH_EOF
|
DOT_CSH_EOF
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
Reference in a new issue