mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
Mark Olesen
@ -16,13 +16,12 @@
|
||||
# - sourced by OpenFOAM-*/etc/cshrc or via foamPV alias
|
||||
#
|
||||
# Description
|
||||
# Setup for PARAVIEW (partially cmake, qt too)
|
||||
# Setup for PARAVIEW (partially QT too)
|
||||
#
|
||||
# To disable use of the PV_PLUGIN_PATH:
|
||||
# ParaView_VERSION=none
|
||||
#
|
||||
# For system-wide installations:
|
||||
# cmake_version=cmake-system
|
||||
# ParaView_QT=qt-system
|
||||
# ParaView_VERSION=system [EXPERIMENTAL]
|
||||
#
|
||||
@ -52,7 +51,6 @@
|
||||
|
||||
set ParaView_VERSION=5.6.3
|
||||
set ParaView_QT=qt-system
|
||||
set cmake_version=cmake-system
|
||||
|
||||
# END OF (NORMAL) USER EDITABLE PART
|
||||
#------------------------------------------------------------------------------
|
||||
@ -65,13 +63,12 @@ if (! $?WM_COMPILER_LIB_ARCH ) setenv WM_COMPILER_LIB_ARCH
|
||||
set archDir="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER"
|
||||
|
||||
# Clean path and library path
|
||||
eval `$WM_PROJECT_DIR/bin/foamCleanPath -csh-env=PATH "$ParaView_DIR $archDir/ParaView- $archDir/qt- $archDir/cmake-"`
|
||||
eval `$WM_PROJECT_DIR/bin/foamCleanPath -csh-env=PATH "$ParaView_DIR $archDir/ParaView- $archDir/qt-"`
|
||||
eval `$WM_PROJECT_DIR/bin/foamCleanPath -csh-env=LD_LIBRARY_PATH "$ParaView_DIR $archDir/ParaView- $archDir/qt-"`
|
||||
|
||||
# Evaluate command-line parameters for ParaView and cmake
|
||||
# Evaluate command-line parameters for ParaView
|
||||
while ( $#argv > 0 )
|
||||
switch ($argv[1])
|
||||
case cmake*=*:
|
||||
case ParaView*=*:
|
||||
# name=value -> set name=value
|
||||
eval "set $argv[1]"
|
||||
@ -80,13 +77,6 @@ while ( $#argv > 0 )
|
||||
shift
|
||||
end
|
||||
|
||||
# ThirdParty cmake
|
||||
set cmake="$archDir/$cmake_version"
|
||||
if ( -r "$cmake/bin/cmake" ) then
|
||||
# _foamAddPath not available when foamPV alias is used
|
||||
setenv PATH "$cmake/bin:${PATH}"
|
||||
endif
|
||||
|
||||
if ($?ParaView_VERSION) then
|
||||
switch ("$ParaView_VERSION")
|
||||
case "":
|
||||
@ -211,7 +201,6 @@ endif
|
||||
unsetenv ParaView_VERSION ParaView_QT
|
||||
|
||||
unset archDir libDir
|
||||
unset cmake cmake_version
|
||||
unset pv_api pvLibDir pvPython qtDir
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
35
etc/config.sh/cmake
Normal file
35
etc/config.sh/cmake
Normal file
@ -0,0 +1,35 @@
|
||||
#----------------------------------*-sh-*--------------------------------------
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | www.openfoam.com
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# Copyright (C) 2020 OpenCFD Ltd.
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
|
||||
#
|
||||
# File
|
||||
# etc/config.sh/cmake
|
||||
# - possibly sourced during make process only.
|
||||
#
|
||||
# Description
|
||||
# CMAKE location (ThirdParty or otherwise) when not found via the PATH
|
||||
# Does not affect the PATH, that is left for the caller
|
||||
#
|
||||
# For system-wide installations:
|
||||
# cmake_version=cmake-system
|
||||
# define CMAKE_ARCH_PATH
|
||||
#
|
||||
# Note
|
||||
# No csh version. This file is only used during make processes.
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
|
||||
|
||||
cmake_version=cmake-system
|
||||
export CMAKE_ARCH_PATH="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake_version"
|
||||
|
||||
# END OF (NORMAL) USER EDITABLE PART
|
||||
#------------------------------------------------------------------------------
|
||||
@ -16,7 +16,7 @@
|
||||
# - sourced by OpenFOAM-*/etc/bashrc or via foamPV alias
|
||||
#
|
||||
# Description
|
||||
# Setup for PARAVIEW (partially cmake, qt too)
|
||||
# Setup for PARAVIEW (partially QT too)
|
||||
#
|
||||
# To disable use of the PV_PLUGIN_PATH:
|
||||
# ParaView_VERSION=none
|
||||
@ -55,7 +55,6 @@
|
||||
|
||||
ParaView_VERSION=5.6.3
|
||||
ParaView_QT=qt-system
|
||||
cmake_version=cmake-system
|
||||
|
||||
# END OF (NORMAL) USER EDITABLE PART
|
||||
#------------------------------------------------------------------------------
|
||||
@ -67,31 +66,23 @@ archDir="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER"
|
||||
# Clean path and library path
|
||||
eval \
|
||||
"$($WM_PROJECT_DIR/bin/foamCleanPath -sh-env=PATH \
|
||||
$ParaView_DIR $archDir/ParaView- $archDir/qt- $archDir/cmake-)"
|
||||
$ParaView_DIR $archDir/ParaView- $archDir/qt-)"
|
||||
|
||||
eval \
|
||||
"$($WM_PROJECT_DIR/bin/foamCleanPath -sh-env=LD_LIBRARY_PATH \
|
||||
$ParaView_DIR $archDir/ParaView- $archDir/qt-)"
|
||||
|
||||
# Evaluate command-line parameters for ParaView and cmake
|
||||
# Evaluate command-line parameters for ParaView
|
||||
for i
|
||||
do
|
||||
case "$i" in
|
||||
(cmake*=* | ParaView*=*)
|
||||
(ParaView*=*)
|
||||
# name=value -> export name=value
|
||||
eval "export $i"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# ThirdParty cmake
|
||||
cmake="$archDir/$cmake_version"
|
||||
if [ -r "$cmake/bin/cmake" ]
|
||||
then
|
||||
# _foamAddPath not available when foamPV function is used
|
||||
PATH="$cmake/bin:$PATH"
|
||||
fi
|
||||
|
||||
case "$ParaView_VERSION" in
|
||||
('')
|
||||
# empty - do nothing
|
||||
@ -206,7 +197,6 @@ then
|
||||
fi
|
||||
|
||||
unset archDir libDir
|
||||
unset cmake cmake_version
|
||||
unset pv_api pvLibDir pvPython qtDir
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
14
etc/openfoam
14
etc/openfoam
@ -63,7 +63,12 @@ options:
|
||||
Open an interactive bash session with an OpenFOAM environment,
|
||||
or run an OpenFOAM application (with arguments) after first sourcing
|
||||
the OpenFOAM etc/bashrc file from the project directory:
|
||||
($projectDir)
|
||||
(${projectDir:-???})
|
||||
|
||||
For a persistent OpenFOAM environment, the following can be added to your
|
||||
~/.bashrc file:
|
||||
|
||||
source ${projectDir:-???}/etc/bashrc
|
||||
|
||||
For more information: www.openfoam.com
|
||||
|
||||
@ -91,8 +96,9 @@ getApiInfo()
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
# No inheritance of FOAM_SETTINGS
|
||||
unset FOAM_SETTINGS
|
||||
# - No inheritance of FOAM_SETTINGS
|
||||
# - No default verbosity (only as command-line option)
|
||||
unset FOAM_CONFIG_ETC FOAM_SETTINGS FOAM_VERBOSE
|
||||
unset _foamEtcDir _foamSettings _foamScriptCommand
|
||||
unset optTestTut
|
||||
|
||||
@ -221,8 +227,6 @@ if [ -n "$_foamEtcDir" ] && [ -d "$_foamEtcDir" ]
|
||||
then
|
||||
# Additional etc directory
|
||||
export FOAM_CONFIG_ETC="$_foamEtcDir"
|
||||
else
|
||||
unset FOAM_CONFIG_ETC
|
||||
fi
|
||||
|
||||
if [ -n "$interactive" ]
|
||||
|
||||
Reference in New Issue
Block a user