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

ENH: streamline handling of static/dynamic libs in detection scripts

Browse Source
This commit is contained in:
Mark Olesen
2019-04-29 10:04:44 +02:00
committed by Andrew Heather
parent beefee48d4
commit 897528da1a
17 changed files with 341 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
wmake/scripts/have_mgridgen
View File

@ -55,7 +55,7 @@ echo_mgridgen()
# -> HAVE_MGRIDGEN, MGRIDGEN_ARCH_PATH, MGRIDGEN_INC_DIR, MGRIDGEN_LIB_DIR
have_mgridgen()
{
local prefix header library static settings warn
local prefix header library incName libName libName2 settings warn
warn="==> skip mgridgen"
# Setup
@ -67,13 +67,11 @@ have_mgridgen()
return 2
fi
# Location
# Expected location, include/library names
prefix="$MGRIDGEN_ARCH_PATH"
# Header/library names
header="mgridgen.h"
library="libMGridGen$extLibso"
static="libmgrid$extLiba"
incName="mgridgen.h"
libName="libMGridGen"
libName2="libmgrid"
# ----------------------------------
if isNone "$prefix"
@ -82,42 +80,36 @@ have_mgridgen()
return 1
elif hasAbsdir "$prefix"
then
header=$(findFirstFile "$prefix/include/$header")
library=$(findFirstFile \
"$(thirdExtLib $library)" \
"$prefix/lib/$static" \
"$prefix/lib/$library" \
"$prefix/lib$WM_COMPILER_LIB_ARCH/$static" \
"$prefix/lib$WM_COMPILER_LIB_ARCH/$library" \
)
header=$(findFirstFile "$prefix/include/$incName")
library="$(findExtLib $libName $libName2)"
elif isSystem "$prefix"
then
prefix=/usr
header=$(findFirstFile "/usr/local/include/$header" "/usr/include/$header")
case "$header" in (/usr/local/*) prefix=/usr/local ;; esac
library=$(findFirstFile \
"$prefix/lib/$library" \
"$prefix/lib$WM_COMPILER_LIB_ARCH/$library" \
)
header=$(findFirstFile "/usr/local/include/$incName" "/usr/include/$incName")
prefix=$(sysPrefix "$header")
else
unset prefix header library
unset prefix
fi
# ----------------------------------
# Header found?
# Header
[ -n "$header" ] || {
#silent# [ -n "$warn" ] && echo "$warn (no header)"
return 2
}
# Library found?
[ -n "$library" ] || {
# Library
[ -n "$library" ] || library=$(findLibrary \
"$prefix/lib/$libName" \
"$prefix/lib/$libName2" \
"$prefix/lib$WM_COMPILER_LIB_ARCH/$libName" \
"$prefix/lib$WM_COMPILER_LIB_ARCH/$libName2" \
) || {
#silent# [ -n "$warn" ] && echo "$warn (no library)"
return 2
}
# ----------------------------------
local good label scalar
# Ensure consistent sizes with OpenFOAM and mgridgen header