zhyang-dev/ThirdParty-common
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/ThirdParty-common.git synced 2025-12-08 06:57:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: check for wmake toolchain when building third-party (fixes #30)

Browse Source
This commit is contained in:
Mark Olesen
2018-01-08 13:39:15 +01:00
parent f49d26dad5
commit 43cbb24ddd
3 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
etc/tools/ThirdPartyFunctions
View File

@ -92,6 +92,29 @@ whichMpicc()
echo "${mpicc:-mpicc}" echo "${mpicc:-mpicc}"
} }
# The presence of wmkdep etc required for building with wmake
requireWMakeToolchain()
{
local dir="${WM_DIR:-$WM_PROJECT_DIR/wmake}"
local src="$dir/src"
local bin="$dir/platforms/$WM_ARCH$WM_COMPILER/wmkdep"
test -x $bin || {
echo "Warning: the 'wmkdep' binary is missing - attempting to build it"
( cd $src && make -s )
}
test -x $bin || {
exec 1>&2
echo
echo "Error: cannot use wmake build for '${0##*/}"
echo " The 'wmkdep' binary is missing"
echo " Please run the top-level OpenFOAM Allwmake first"
echo
exit 1
}
}
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Some functions as per OpenFOAM etc/config.sh/functions # Some functions as per OpenFOAM etc/config.sh/functions

4
makeCCMIO
View File

@ -4,7 +4,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016-2018 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -89,6 +89,8 @@ do
shift shift
done done
requireWMakeToolchain
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# Build LIBCCMIO # Build LIBCCMIO

4
makeKAHIP
View File

@ -3,7 +3,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. # \\ / A nd | Copyright (C) 2017-2018 OpenCFD Ltd.
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -119,6 +119,8 @@ then
exit 0 exit 0
fi fi
requireWMakeToolchain
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# Build KaHIP # Build KaHIP