Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
ThirdParty-common
Commits
43cbb24d
Commit
43cbb24d
authored
Jan 08, 2018
by
Mark OLESEN
Browse files
COMP: check for wmake toolchain when building third-party (fixes
#30
)
parent
f49d26da
Changes
3
Hide whitespace changes
Inline
Side-by-side
etc/tools/ThirdPartyFunctions
View file @
43cbb24d
...
...
@@ -92,6 +92,29 @@ whichMpicc()
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
...
...
makeCCMIO
View file @
43cbb24d
...
...
@@ -4,7 +4,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation | Copyright (C) 2016-201
7
OpenCFD Ltd.
# \\/ M anipulation | Copyright (C) 2016-201
8
OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, licensed under GNU General Public License
...
...
@@ -89,6 +89,8 @@ do
shift
done
requireWMakeToolchain
#------------------------------------------------------------------------------
#
# Build LIBCCMIO
...
...
makeKAHIP
View file @
43cbb24d
...
...
@@ -3,7 +3,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2017 OpenCFD Ltd.
# \\ / A nd | Copyright (C) 2017
-2018
OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
...
...
@@ -119,6 +119,8 @@ then
exit
0
fi
requireWMakeToolchain
#------------------------------------------------------------------------------
#
# Build KaHIP
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment