From 46929c0670f1fcf5cd78e204ca5a81f7e5cf1816 Mon Sep 17 00:00:00 2001 From: Julie Prestopnik Date: Mon, 9 Oct 2023 14:47:28 -0600 Subject: [PATCH] Per #2669, updated installation files for SQLITE changes --- internal/scripts/installation/config/install_met_env.hera | 3 ++- internal/scripts/installation/config/install_met_env.jet | 3 ++- .../scripts/installation/config/install_met_env_met_only.hera | 3 ++- .../scripts/installation/config/install_met_env_met_only.jet | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/internal/scripts/installation/config/install_met_env.hera b/internal/scripts/installation/config/install_met_env.hera index 1cde5abd05..2b7b6ed08f 100755 --- a/internal/scripts/installation/config/install_met_env.hera +++ b/internal/scripts/installation/config/install_met_env.hera @@ -26,7 +26,8 @@ export EXTERNAL_LIBS=/contrib/met/12.0.0/external_libs/ #export LIB_JASPER=${EXTERNAL_LIBS}/lib #export LIB_LIBPNG=${EXTERNAL_LIBS}/lib #export LIB_Z=${EXTERNAL_LIBS}/lib -#export SQLITE_DIR=${EXTERNAL_LIBS} +#export SQLITE_INCLUDE_DIR=${EXTERNAL_LIBS}/include +#export SQLITE_LIB_DIR=${EXTERNAL_LIBS}/lib #export CFLAGS="-Wall -g" #export CXXFLAGS="-Wall -g -lcurl" export MAKE_ARGS=-j diff --git a/internal/scripts/installation/config/install_met_env.jet b/internal/scripts/installation/config/install_met_env.jet index 3c4adc1e30..87442a55fe 100644 --- a/internal/scripts/installation/config/install_met_env.jet +++ b/internal/scripts/installation/config/install_met_env.jet @@ -29,7 +29,8 @@ export EXTERNAL_LIBS=${TEST_BASE}/external_libs/ #export LIB_JASPER=${EXTERNAL_LIBS}/lib #export LIB_LIBPNG=${EXTERNAL_LIBS}/lib #export LIB_Z=${EXTERNAL_LIBS}/lib -#export SQLITE_DIR=${EXTERNAL_LIBS} +#export SQLITE_INCLUDE_DIR=${EXTERNAL_LIBS}/include +#export SQLITE_LIB_DIR=${EXTERNAL_LIBS}/lib export MAKE_ARGS=-j export SET_D64BIT=FALSE export CXXFLAGS="-std=c++11" diff --git a/internal/scripts/installation/config/install_met_env_met_only.hera b/internal/scripts/installation/config/install_met_env_met_only.hera index 6555e97ba0..b8ac02a3e0 100644 --- a/internal/scripts/installation/config/install_met_env_met_only.hera +++ b/internal/scripts/installation/config/install_met_env_met_only.hera @@ -26,7 +26,8 @@ export GRIB2CLIB_NAME=-lgrib2c export LIB_JASPER=${EXTERNAL_LIBS}/lib export LIB_LIBPNG=${EXTERNAL_LIBS}/lib export LIB_Z=${EXTERNAL_LIBS}/lib -export SQLITE_DIR=${EXTERNAL_LIBS} +export SQLITE_INCLUDE_DIR=${EXTERNAL_LIBS}/include +export SQLITE_LIB_DIR=${EXTERNAL_LIBS}/lib #export CFLAGS="-Wall -g" #export CXXFLAGS="-Wall -g -lcurl" export MAKE_ARGS=-j diff --git a/internal/scripts/installation/config/install_met_env_met_only.jet b/internal/scripts/installation/config/install_met_env_met_only.jet index 2bfcf14d04..00b9d689d2 100644 --- a/internal/scripts/installation/config/install_met_env_met_only.jet +++ b/internal/scripts/installation/config/install_met_env_met_only.jet @@ -29,7 +29,8 @@ export MET_NETCDF=${EXTERNAL_LIBS} export LIB_JASPER=${EXTERNAL_LIBS}/lib export LIB_LIBPNG=${EXTERNAL_LIBS}/lib export LIB_Z=${EXTERNAL_LIBS}/lib -export SQLITE_DIR=${EXTERNAL_LIBS} +export SQLITE_INCLUDE_DIR=${EXTERNAL_LIBS}/include +export SQLITE_LIB_DIR=${EXTERNAL_LIBS}/lib export MAKE_ARGS=-j export SET_D64BIT=FALSE export CXXFLAGS="-std=c++11"