FDS Build: Change compilers environemnt variable, set FIREMODELS

Author: cxp484

Build/Scripts/HYPRE/build_hypre.sh

@@ -32,7 +32,7 @@ if [ -d "$FIREMODELS/hypre" ]; then
   cd $FIREMODELS/hypre
   if [[ "$(git tag -l "v2.32.0")" == "v2.32.0" ]]; then
     echo "Checking out v2.32.0"
-    $(git checkout v2.32.0)
+    git checkout v2.32.0
   fi
   cd $FIREMODELS/hypre/src/cmbuild
   export HYPRE_VERSION=$(git describe)
@@ -42,7 +42,7 @@ if [ -d "$FIREMODELS/hypre" ]; then
   ./$CONFMAKE
   # get back from detached HEAD state
   cd $FIREMODELS/hypre
-  $(git checkout master)
+  git checkout master
   cd $dir
   export HYPRE_HOME=$FIREMODELS/libs/hypre/$HYPRE_VERSION
   echo "Hypre library:" $FIREMODELS/libs/hypre/$HYPRE_VERSION

Build/Scripts/HYPRE/confmake.sh

@@ -17,10 +17,13 @@ cmake_args=(
 
 # Add OSX deployment target if building for macOS
 if [[ "$FDS_BUILD_TARGET" == *"osx"* ]]; then
-  cmake_args+=(-DCMAKE_OSX_DEPLOYMENT_TARGET="10.0")
+   if [ "$(uname -m)" == "x86_64" ]; then
+      cmake_args+=(-DCMAKE_OSX_DEPLOYMENT_TARGET="10.6")
+   else
+      cmake_args+=(-DCMAKE_OSX_DEPLOYMENT_TARGET="13.0")
+   fi
 fi
 
-
 # Run cmake with the arguments
 cmake ../ "${cmake_args[@]}"
 

Build/Scripts/SUNDIALS/build_sundials.sh

@@ -33,7 +33,7 @@ if [ -d "$FIREMODELS/sundials" ]; then
   cd $FIREMODELS/sundials
   if [[ "$(git tag -l "v6.7.0")" == "v6.7.0" ]]; then
     echo "Checking out v6.7.0"
-    $(git checkout v6.7.0)
+    git checkout v6.7.0
   fi 
   mkdir $FIREMODELS/sundials/BUILDDIR
   cd $FIREMODELS/sundials/BUILDDIR
@@ -46,7 +46,7 @@ if [ -d "$FIREMODELS/sundials" ]; then
   ./$CONFMAKE
   # get back from detached HEAD state
   cd $FIREMODELS/sundials
-  $(git checkout main)
+  git checkout main
   cd $dir
   export SUNDIALS_HOME=$FIREMODELS/libs/sundials/$SUNDIALS_VERSION
   echo "Sundials library:" $FIREMODELS/libs/sundials/$SUNDIALS_VERSION

Build/Scripts/SUNDIALS/confmake.sh

@@ -16,7 +16,11 @@ cmake_args=(
 
 # Add OSX deployment target if building for macOS
 if [[ "$FDS_BUILD_TARGET" == *"osx"* ]]; then
-  cmake_args+=(-DCMAKE_OSX_DEPLOYMENT_TARGET="10.0")
+   if [ "$(uname -m)" == "x86_64" ]; then
+      cmake_args+=(-DCMAKE_OSX_DEPLOYMENT_TARGET="10.6")
+   else
+      cmake_args+=(-DCMAKE_OSX_DEPLOYMENT_TARGET="13.0")
+   fi
 fi
 
 # Run cmake with the arguments

Build/Scripts/build_thirdparty_libs.sh

@@ -1,5 +1,12 @@
 # PARSE OPTIONS FOR CLEAN LIBRARY BUILDS ####################################
 
+# Set FIREMODELS environment variable if it is not already exists.
+if [ -z "${FIREMODELS}" ]; then
+    export FIREMODELS="$(readlink -f "$(pwd)/../../../")"
+fi 
+
+echo "FIREMODELS=$FIREMODELS"
+
 clean_hypre=false
 clean_sundials=false
 ARG=""
@@ -40,7 +47,6 @@ fi
 # FINISHED WITH CLEANING OPTIONS ###########################################
 
 # Decide compilers
-echo "Before setting tpt comp"
 source ../Scripts/set_thirdparty_compilers.sh
 
 # build hypre

Build/Scripts/set_thirdparty_compilers.sh

@@ -1,24 +1,36 @@
 echo "FDS build target = $FDS_BUILD_TARGET"
 
 # For following variables 1- indicate availble through 
-# environment variable CCCOMP, CXXCOMP, and FCCOMP
+# environment variable FIREMODELS_CC, FIREMODELS_CXX, and FIREMODELS_FC
 set_CC=0 
 set_CXX=0
 set_FC=0
 
-if [ -n "$CCCOMP" ]; then
-   CC=$CCCOMP
-   set_CC=1
+if [ -n "$FIREMODELS_CC" ]; then
+   CC=$FIREMODELS_CC
+   if command -v $CC &> /dev/null; then
+      set_CC=1
+   else
+      echo "The compiler specified by the FIREMODELS_CC environment variable ($CC) is not available on this system. Searching for an alternative compiler."
+   fi
 fi
 
-if [ -n "$CXXCOMP" ]; then
-   CXX=$CXXCOMP
-   set_CXX=1
+if [ -n "$FIREMODELS_CXX" ]; then
+   CXX=$FIREMODELS_CXX
+   if command -v $CXX &> /dev/null; then
+      set_CXX=1
+   else
+      echo "The compiler specified by the FIREMODELS_CXX environment variable ($CXX) is not available on this system. Searching for an alternative compiler."
+   fi
 fi
 
-if [ -n "$FCCOMP" ]; then
-   FC=$FCCOMP
-   set_FC=1
+if [ -n "$FIREMODELS_FC" ]; then
+   FC=$FIREMODELS_FC
+   if command -v $FC &> /dev/null; then
+      set_FC=1
+   else
+      echo "The compiler specified by the FIREMODELS_FC environment variable ($FC) is not available on this system. Searching for an alternative compiler."
+   fi
 fi