CONFIG: wmake -show-xyz in more places (issue #1256)

This commit is contained in:
Mark Olesen
2019-04-12 11:02:30 +02:00
committed by Andrew Heather
parent 787325a916
commit ee4300b0a1
4 changed files with 25 additions and 16 deletions

View File

@ -3,7 +3,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd |
# \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
# \\/ M anipulation |
#-------------------------------------------------------------------------------
# | Copyright (C) 2011-2015 OpenFOAM Foundation
@ -236,10 +236,13 @@ reportExecutable()
| sed -ne 's/^.*Version: *\([^ ][^ ]*\).*/\1/p')
;;
flex)
VERSION=$($APP_NAME --version /dev/null 2>&1 \
VERSION=$(flex --version /dev/null 2>&1 \
| sed -ne 's/flex \([0-9][0-9.]*\).*/\1/p')
;;
gcc* | g++*)
wmake)
VERSION="$(wmake -show-api 2> /dev/null)"
;;
*gcc* | *g++*)
VERSION=$($APP_NAME -v 2>&1 \
| sed -ne 's/^gcc version \([0-9][0-9.]*\).*/\1/p')
@ -424,8 +427,9 @@ hline
echo "$(fixlen Software 9) $(fixlen Version 10) $(fixlen Location 10)"
hline
reportExecutable flex
reportExecutable "$WM_CC"
reportExecutable "$WM_CXX"
reportExecutable wmake
reportExecutable "$(wmake -show-c)"
reportExecutable "$(wmake -show-cxx)"
reportExecutable gzip
if [ "$OSTYPE" = Linux ]
then