songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CONFIG: ptscotch header not found on ArchLinux (fixes #1877)

Browse Source 
- on ArchLinux, everything is installed under /usr/include/scotch.

  The detection script uses SCOTCH_ARCH_PATH as an initial guess for
  ptscotch as well. However, on the second pass, it has an absolute
  value ("/usr") instead of a logical one ("scotch-system").
  This resulted in the logic for handling scotch+ptscotch subdirs
  being bypassed.
This commit is contained in:
Mark Olesen 2020-10-12 10:34:43 +02:00
parent c1ad429564
commit bea6563210
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wmake/scripts/have_scotch
View File

@ -90,6 +90,7 @@ search_scotch()
then then
header=$(findFirstFile \ header=$(findFirstFile \
"$prefix/include/$localDir/$incName" \ "$prefix/include/$localDir/$incName" \
"$prefix/include/scotch/$incName" \
"$prefix/include/$incName" \ "$prefix/include/$incName" \
) )
library=$(findExtLib "$libName") library=$(findExtLib "$libName")
@ -201,12 +202,15 @@ search_ptscotch()
header=$(findFirstFile \ header=$(findFirstFile \
"$prefix/include/$FOAM_MPI/$incName" \ "$prefix/include/$FOAM_MPI/$incName" \
"$prefix/include/$localDir/$incName" \ "$prefix/include/$localDir/$incName" \
"$prefix/include/ptscotch/$incName" \
"$prefix/include/scotch/$incName" \
"$prefix/include/$incName" "$prefix/include/$incName"
) )
library="$(findExtLib $FOAM_MPI/$libName $libName)" library="$(findExtLib $FOAM_MPI/$libName $libName)"
elif isSystem "$prefix" elif isSystem "$prefix"
then then
header=$(findFirstFile \ header=$(findFirstFile \
"/usr/local/include/$localDir/$incName" \
"/usr/local/include/ptscotch/$incName" \ "/usr/local/include/ptscotch/$incName" \
"/usr/local/include/scotch/$incName" \ "/usr/local/include/scotch/$incName" \
"/usr/local/include/$incName" \ "/usr/local/include/$incName" \