From 59a8bd1b476e34dc03c7005b4232c2957400e64d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 12 Apr 2019 11:02:30 +0200
Subject: [PATCH] CONFIG: wmake -show-xyz in more places (issue #1256)

---
 Allwmake-scan                |  4 ++--
 bin/foamInstallationTest     | 14 +++++++++-----
 wmake/scripts/cmakeFunctions | 10 ++++++----
 wmake/scripts/sysFunctions   | 13 ++++++++-----
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/Allwmake-scan b/Allwmake-scan
index eeb7c274ad..064ff08459 100755
--- a/Allwmake-scan
+++ b/Allwmake-scan
@@ -1,8 +1,8 @@
 #!/bin/sh
 # Allwmake with scan-build (clang)
 
-c_compiler="$(command -v $WM_CC)"
-cxx_compiler"$(command -v $WM_CXX)"
+c_compiler="$(command -v "$(wmake -show-c)")"
+cxx_compiler="$(command -v "$(wmake -show-cxx)")"
 
 set -x
 
diff --git a/bin/foamInstallationTest b/bin/foamInstallationTest
index 1530e68439..94753f55a3 100755
--- a/bin/foamInstallationTest
+++ b/bin/foamInstallationTest
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011, 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
diff --git a/wmake/scripts/cmakeFunctions b/wmake/scripts/cmakeFunctions
index 877d81f140..d7f6f8a5b7 100644
--- a/wmake/scripts/cmakeFunctions
+++ b/wmake/scripts/cmakeFunctions
@@ -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)"
 
 #------------------------------------------------------------------------------
 
diff --git a/wmake/scripts/sysFunctions b/wmake/scripts/sysFunctions
index a11f58c3c4..3771a90d5d 100644
--- a/wmake/scripts/sysFunctions
+++ b/wmake/scripts/sysFunctions
@@ -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"
     }
 
 
-- 
GitLab