Merge pull request #13793 from cxp484/master

FDS Build: Set thirdparty fortran compiler based on INTEL_IFORT

Author: cxp484

Build/Scripts/HYPRE/build_hypre.bat

@@ -150,7 +150,7 @@ cd %BUILDDIR%
 cmake ..\  ^
 -G "MinGW Makefiles" ^
 -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" ^
--DCMAKE_C_COMPILER=icx ^
+-DCMAKE_C_COMPILER=%CC% ^
 -DCMAKE_C_FLAGS="/DWIN32 -O3 /fp:precise" ^
 -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded" ^
 -DCMAKE_MAKE_PROGRAM="%CMAKE_MAKE_PROGRAM%" ^

Build/Scripts/SUNDIALS/build_sundials.bat

@@ -130,8 +130,8 @@ cmake ..\  ^
 -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" ^
 -DEXAMPLES_INSTALL_PATH="%INSTALLDIR%\examples" ^
 -DBUILD_FORTRAN_MODULE_INTERFACE=ON ^
--DCMAKE_C_COMPILER=icx ^
--DCMAKE_Fortran_COMPILER=ifx ^
+-DCMAKE_C_COMPILER=%CC% ^
+-DCMAKE_Fortran_COMPILER=%FC% ^
 -DEXAMPLES_ENABLE_C=OFF ^
 -DEXAMPLES_ENABLE_CXX=OFF ^
 -DEXAMPLES_ENABLE_F2003=OFF ^

Build/Scripts/build_thirdparty_libs.bat

@@ -88,10 +88,25 @@ set SCRIPTDIR=%~dp0
 cd %SCRIPTDIR%
 SET SCRIPTDIR=%CD%
 
+
+:: Decide C and FORTRAN COMPILER for third-party builds
+set CC=icx
+if "x%INTEL_IFORT%" == "x" (
+    set FC=ifx
+) else (
+    set FC=%INTEL_IFORT%
+)
+echo.
+echo Third-party libs C Compiler=%CC%
+echo Third-party libs Fortran Compiler=%FC%
+echo.
+
+
+::Call HYPRE and SUNDIALS build script
 cd %SCRIPTDIR%\HYPRE
 call build_hypre %clean_hypre%
 
 cd %SCRIPTDIR%\SUNDIALS
 call build_sundials %clean_sundials%
 
-cd %CURDIR_3RDPARTY%
+cd %CURDIR_3RDPARTY%