zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
Allwmake-scan
View File

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
# Allwmake with scan-build (clang) # Allwmake with scan-build (clang)
c_compiler="$(command -v $WM_CC)" c_compiler="$(command -v "$(wmake -show-c)")"
cxx_compiler"$(command -v $WM_CXX)" cxx_compiler="$(command -v "$(wmake -show-cxx)")"
set -x set -x

14
bin/foamInstallationTest
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 | # \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# | Copyright (C) 2011-2015 OpenFOAM Foundation # | Copyright (C) 2011-2015 OpenFOAM Foundation
@ -236,10 +236,13 @@ reportExecutable()
| sed -ne 's/^.*Version: *\([^ ][^ ]*\).*/\1/p') | sed -ne 's/^.*Version: *\([^ ][^ ]*\).*/\1/p')
;; ;;
flex) 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') | 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 \ VERSION=$($APP_NAME -v 2>&1 \
| sed -ne 's/^gcc version \([0-9][0-9.]*\).*/\1/p') | 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)" echo "$(fixlen Software 9) $(fixlen Version 10) $(fixlen Location 10)"
hline hline
reportExecutable flex reportExecutable flex
reportExecutable "$WM_CC" reportExecutable wmake
reportExecutable "$WM_CXX" reportExecutable "$(wmake -show-c)"
reportExecutable "$(wmake -show-cxx)"
reportExecutable gzip reportExecutable gzip
if [ "$OSTYPE" = Linux ] if [ "$OSTYPE" = Linux ]
then then

10
wmake/scripts/cmakeFunctions
View File

@ -2,7 +2,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-2018 OpenCFD Ltd. # \\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd.
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -17,10 +17,12 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
. $WM_PROJECT_DIR/wmake/scripts/wmakeFunctions # Require some wmake functions . $WM_PROJECT_DIR/wmake/scripts/wmakeFunctions # Require some wmake functions
# Ensure CMake gets the correct C/C++ compilers # Export compiler information for cmake
[ -n "$WM_CC" ] && export CC="$WM_CC" export CC="$(wmake -show-c)"
[ -n "$WM_CXX" ] && export CXX="$WM_CXX" export CXX="$(wmake -show-cxx)"
export CFLAGS="$(wmake -show-cflags)"
export CXXFLAGS="$(wmake -show-cxxflags)"
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

13
wmake/scripts/sysFunctions
View File

@ -2,7 +2,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) 2018 OpenCFD Ltd. # \\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd.
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -34,16 +34,19 @@ then
# Load once, but do not rely on this variable elsewhere # Load once, but do not rely on this variable elsewhere
WMAKE_SCRIPTS_SYSFUNCTIONS=loaded WMAKE_SCRIPTS_SYSFUNCTIONS=loaded
# Static library extension. Default=.a # Static library extension (default=".a")
extLiba=".a" extLiba=".a"
# Shared library extension. Default=.so # Shared library extension (default=".so")
extLibso=".so"
# Adjustments
case "$(uname -s 2>/dev/null)" in case "$(uname -s 2>/dev/null)" in
Darwin) Darwin)
extLibso=".dylib" extLibso=".dylib"
;; ;;
*) *)
extLibso=".so" ## Other. Eg, extLibso=".dll" or extLibso=".dll.a"
;; ;;
esac esac
@ -59,7 +62,7 @@ then
# Uses cached value from libso extension # Uses cached value from libso extension
isWindows() isWindows()
{ {
test "$extLibso" = ".dll" test "$extLibso" = ".dll" || "$extLibso" = ".dll.a"
} }