zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CONFIG: include static libraries in FFTW search (#1087)

Browse Source
This commit is contained in:
Mark Olesen
2018-11-21 13:49:16 +01:00
parent 5187aa13aa
commit e35ac89efb
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wmake/scripts/have_fftw
View File

@ -68,6 +68,7 @@ have_fftw()
# Header/library names # Header/library names
header="fftw3.h" header="fftw3.h"
library="libfftw3$extLibso" library="libfftw3$extLibso"
static="libfftw3$extLiba"
if hasAbsdir "$FFTW_ARCH_PATH" if hasAbsdir "$FFTW_ARCH_PATH"
@ -77,7 +78,9 @@ have_fftw()
# FOAM_EXT_LIBBIN is allowed to be unset # FOAM_EXT_LIBBIN is allowed to be unset
library=$(findFirstFile \ library=$(findFirstFile \
$FOAM_EXT_LIBBIN/$library \ $FOAM_EXT_LIBBIN/$library \
$FFTW_ARCH_PATH/lib/$static \
$FFTW_ARCH_PATH/lib/$library \ $FFTW_ARCH_PATH/lib/$library \
$FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/$static \
$FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/$library \ $FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/$library \
) )
elif isSystem "$FFTW_ARCH_PATH" elif isSystem "$FFTW_ARCH_PATH"

12
wmake/scripts/have_hypre
View File

@ -55,9 +55,17 @@ echo_hypre()
have_hypre() have_hypre()
{ {
local header library static label settings warn local header library static label settings warn
# warn="==> skip hypre" warn="==> skip hypre"
# Basic setup/checks # Basic setup/checks. Prefer current environment value? (TDB)
if [ ! -d "$HYPRE_ARCH_PATH" ]
then
settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/hypre) || {
[ -n "$warn" ] && echo "$warn (no config.sh/hypre settings)"
return 1
}
. $settings
fi
if isNone "$HYPRE_ARCH_PATH" if isNone "$HYPRE_ARCH_PATH"
then then
[ -n "$warn" ] && echo "$warn (not available)" [ -n "$warn" ] && echo "$warn (not available)"