Skip to content

Commit 6f5962d

Browse files
committed
scripts: corrections to sundials windows build script (add intel compiler setup), other minor edits
1 parent 98b2683 commit 6f5962d

File tree

2 files changed

+26
-8
lines changed

2 files changed

+26
-8
lines changed

Build/Scripts/HYPRE/build_hypre.bat

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
@echo off
22
set LIB_TAG=v2.32.0
3+
4+
::*** library and tag name are the same
5+
36
set LIB_DIR=%LIB_TAG%
47

8+
9+
::*** placehoder for parsing options
10+
511
call :getopts %*
612
if %stopscript% == 1 exit /b
713

Build/Scripts/SUNDIALS/build_sundials.bat

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
@echo off
22
set LIB_TAG=v6.7.0
3+
4+
::*** library and tag name are the same
5+
36
set LIB_DIR=%LIB_TAG%
47

8+
::*** placehoder for parsing options
9+
510
call :getopts %*
611
if %stopscript% == 1 exit /b
712

@@ -52,22 +57,27 @@ if exist %LIB_REPO% goto endif3
5257

5358
cd %LIB_REPO%
5459

60+
set buildstatus=build
5561
echo.
5662
echo ----------------------------------------------------------
5763
echo ----------------------------------------------------------
5864
echo building Sundials library version %LIB_TAG%
5965
echo ----------------------------------------------------------
6066
echo ----------------------------------------------------------
67+
echo.
68+
6169
echo.
6270
echo ----------------------------------------------------------
6371
echo ----------------------------------------------------------
64-
echo checking out version %LIB_TAG%
72+
echo setting up Intel compilers
6573
echo ----------------------------------------------------------
6674
echo ----------------------------------------------------------
6775
echo.
76+
call %FIREMODELS%\fds\Build\Scripts\setup_intel_compilers.bat
6877

69-
git checkout %LIB_TAG%
78+
git checkout %LIB_TAG%
7079

80+
echo.
7181
echo ----------------------------------------------------------
7282
echo ----------------------------------------------------------
7383
echo cleaning sundials repo
@@ -82,7 +92,9 @@ git clean -dxf
8292
mkdir %BUILDDIR%
8393
cd %BUILDDIR%
8494

85-
:: configure sundials
95+
::*** configure sundials
96+
97+
echo.
8698
echo ----------------------------------------------------------
8799
echo ----------------------------------------------------------
88100
echo configuring sundials version %SUNDIALSTAG%
@@ -106,7 +118,9 @@ cmake ..\ ^
106118
-DCMAKE_C_FLAGS_RELEASE="${CMAKE_C_FLAGS_RELEASE} /MT" ^
107119
-DCMAKE_C_FLAGS_DEBUG="${CMAKE_C_FLAGS_DEBUG} /MTd"
108120

109-
:: build and install sundials
121+
::*** build and install sundials
122+
123+
echo.
110124
echo ----------------------------------------------------------
111125
echo ----------------------------------------------------------
112126
echo building sundials version %LIB_TAG%
@@ -115,6 +129,7 @@ echo ----------------------------------------------------------
115129
echo.
116130
call make
117131

132+
echo.
118133
echo ----------------------------------------------------------
119134
echo ----------------------------------------------------------
120135
echo installing sundials version %LIB_TAG% in %INSTALLDIR%
@@ -123,16 +138,13 @@ echo ----------------------------------------------------------
123138
echo.
124139
call make install
125140

141+
echo.
126142
echo ----------------------------------------------------------
127143
echo ----------------------------------------------------------
128144
echo setting SUNDIALS_HOME environment variable to %INSTALLDIR%
129145
set SUNDIALS_HOME=%INSTALLDIR%
130-
echo ----------------------------------------------------------
131-
echo ----------------------------------------------------------
132146
echo.
133147

134-
echo ----------------------------------------------------------
135-
echo ----------------------------------------------------------
136148
echo sundials version %LIB_TAG% installed in %INSTALLDIR%
137149
echo ----------------------------------------------------------
138150
echo ----------------------------------------------------------

0 commit comments

Comments
 (0)