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

10
wmake/scripts/cmakeFunctions
View File

@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2017-2018 OpenCFD Ltd.
# \\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@ -17,10 +17,12 @@
#------------------------------------------------------------------------------
. $WM_PROJECT_DIR/wmake/scripts/wmakeFunctions # Require some wmake functions
# Ensure CMake gets the correct C/C++ compilers
[ -n "$WM_CC" ] && export CC="$WM_CC"
[ -n "$WM_CXX" ] && export CXX="$WM_CXX"
# Export compiler information for cmake
export CC="$(wmake -show-c)"
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
# \\ / O peration |
# \\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
# \\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@ -34,16 +34,19 @@ then
# Load once, but do not rely on this variable elsewhere
WMAKE_SCRIPTS_SYSFUNCTIONS=loaded
# Static library extension. Default=.a
# Static library extension (default=".a")
extLiba=".a"
# Shared library extension. Default=.so
# Shared library extension (default=".so")
extLibso=".so"
# Adjustments
case "$(uname -s 2>/dev/null)" in
Darwin)
extLibso=".dylib"
;;
*)
extLibso=".so"
## Other. Eg, extLibso=".dll" or extLibso=".dll.a"
;;
esac
@ -59,7 +62,7 @@ then
# Uses cached value from libso extension
isWindows()
{
test "$extLibso" = ".dll"
test "$extLibso" = ".dll" || "$extLibso" = ".dll.a"
}