mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-12-28 03:37:59 +00:00
ENH: handle wmake -debug option via FOAM_EXTRA_CXX_FLAGS
- ensures that subsequent Allwmake scripts know about it. ENH: add bin/tools/query-detect wrapper for wmake have_* scripts CONFIG: use project/ThirdParty without additional sanity checks - no need to test for Allwmake or platforms/ if ThirdParty is located within the project directory itself. COMP: add simple mpi test to 00-dummy - for testing library linkage, etc.
This commit is contained in:
@ -8,8 +8,7 @@
|
||||
# Copyright (C) 2019 OpenCFD Ltd.
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM, licensed under GNU General Public License
|
||||
# <http://www.gnu.org/licenses/>.
|
||||
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
|
||||
#
|
||||
# Script
|
||||
# list_tools
|
||||
|
||||
28
wmake/wmake
28
wmake/wmake
@ -195,7 +195,7 @@ allCores()
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# Default to compiling the local target only
|
||||
unset optAll optUpdate optDebug optQuiet optShow optPwd
|
||||
unset optAll optUpdate optCxx optDebug optQuiet optShow optPwd
|
||||
|
||||
# Consistency with inherited values
|
||||
if [ "$WM_QUIET" = true ]
|
||||
@ -231,7 +231,7 @@ do
|
||||
export WM_QUIET=true
|
||||
;;
|
||||
-debug)
|
||||
optDebug="-DFULLDEBUG -g -O0"
|
||||
optDebug=true
|
||||
;;
|
||||
|
||||
-module-prefix=*)
|
||||
@ -489,13 +489,29 @@ unset exitCode
|
||||
# Recurse the source tree to compile "all" targets
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
if [ -n "$optDebug" ]
|
||||
then
|
||||
# Convey -debug via FOAM_EXTRA_CXXFLAGS
|
||||
optDebug="-DFULLDEBUG -g"
|
||||
oldFlags="$FOAM_EXTRA_CXXFLAGS"
|
||||
|
||||
case "$oldFlags" in
|
||||
(*-DFULLDEBUG*)
|
||||
# Already there
|
||||
;;
|
||||
(*)
|
||||
export FOAM_EXTRA_CXXFLAGS="$oldFlags${oldFlags:+ }$optDebug"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if [ "$optAll" = all ]
|
||||
then
|
||||
if [ -e Allwmake.override ]
|
||||
then
|
||||
if [ -x Allwmake.override ]
|
||||
then
|
||||
./Allwmake.override -fromWmake ${optDebug:+-debug} $targetType
|
||||
./Allwmake.override -fromWmake $targetType
|
||||
exitCode="$?"
|
||||
else
|
||||
# Allow empty or non-executable file (eg, touch Allwmake.override)
|
||||
@ -503,7 +519,7 @@ then
|
||||
fi
|
||||
elif [ -e Allwmake ]
|
||||
then
|
||||
./Allwmake -fromWmake ${optDebug:+-debug} $targetType
|
||||
./Allwmake -fromWmake $targetType
|
||||
exitCode="$?"
|
||||
fi
|
||||
|
||||
@ -531,7 +547,6 @@ then
|
||||
# Compile all applications in sub-directories
|
||||
$make ${WM_CONTINUE_ON_ERROR:+-k} \
|
||||
-f $WM_DIR/makefiles/apps \
|
||||
${optDebug:+c++DBUG="$optDebug"} \
|
||||
TARGET="$targetType" FOAM_APPS="$FOAM_APPS"
|
||||
exitCode=$?
|
||||
fi
|
||||
@ -558,7 +573,7 @@ then
|
||||
"$WM_SCHEDULER" -clean \
|
||||
&& wmake -all objects \
|
||||
&& "$WM_SCHEDULER"
|
||||
) && wmake -all ${optDebug:+-debug}
|
||||
) && wmake -all
|
||||
exit $?
|
||||
fi
|
||||
|
||||
@ -678,7 +693,6 @@ fi
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
exec $make -f $WM_DIR/makefiles/general \
|
||||
${optDebug:+c++DBUG="$optDebug"} \
|
||||
MAKE_DIR=$MakeDir OBJECTS_DIR=$objectsDir $targetType
|
||||
|
||||
exit 0 # clean exit
|
||||
|
||||
Reference in New Issue
Block a user