diff --git a/cmake/std/atdm/ATDMDevEnvSettings.cmake b/cmake/std/atdm/ATDMDevEnvSettings.cmake index feb6c55b38fd..258620acba05 100644 --- a/cmake/std/atdm/ATDMDevEnvSettings.cmake +++ b/cmake/std/atdm/ATDMDevEnvSettings.cmake @@ -418,6 +418,7 @@ ENDIF() # Netcdf ATDM_SET_ENABLE(TPL_ENABLE_Netcdf ON) +ATDM_SET_CACHE(NETCDF_ROOT "$ENV(NETCDF_ROOT)" CACHE FILEPATH) IF (ATDM_USE_SPARC_TPL_FIND_SETTINGS) # SPARC ATDM Trilinos configuration has SEACAS-customized FindNetCDF.cmake # module recurrsively find PNetCDF and HDF5 internally! diff --git a/cmake/std/atdm/sems-rhel6/environment.sh b/cmake/std/atdm/sems-rhel6/environment.sh index 168a2356c7a1..3070ca0aad79 100755 --- a/cmake/std/atdm/sems-rhel6/environment.sh +++ b/cmake/std/atdm/sems-rhel6/environment.sh @@ -195,7 +195,7 @@ fi export ATDM_CONFIG_HDF5_LIBS="${HDF5_ROOT}/lib/libhdf5_hl.${ATDM_CONFIG_TPL_LIB_EXT};${HDF5_ROOT}/lib/libhdf5.${ATDM_CONFIG_TPL_LIB_EXT};${ZLIB_ROOT}/lib/libz.${ATDM_CONFIG_TPL_LIB_EXT};-ldl" -export ATDM_CONFIG_NETCDF_LIBS="-L${NETCDF_ROOT}/lib;${NETCDF_ROOT}/lib/libnetcdf.${ATDM_CONFIG_TPL_LIB_EXT};${PNETCDF_ROOT}/lib/libpnetcdf.${ATDM_CONFIG_TPL_LIB_EXT};${ATDM_CONFIG_HDF5_LIBS};-lcurl" +export ATDM_CONFIG_NETCDF_LIBS="-L${NETCDF_ROOT}/lib;${NETCDF_ROOT}/lib/libnetcdf.${ATDM_CONFIG_TPL_LIB_EXT};${PNETCDF_ROOT}/lib/libpnetcdf.a;${ATDM_CONFIG_HDF5_LIBS};-lcurl" # NOTE: SEMS does not provide a *.a files for PNetCDF so we can't use them in # a shared lib build :-( diff --git a/cmake/std/atdm/sems-rhel7/environment.sh b/cmake/std/atdm/sems-rhel7/environment.sh index 4e5a381bca4a..bdefc2bf0bcc 100755 --- a/cmake/std/atdm/sems-rhel7/environment.sh +++ b/cmake/std/atdm/sems-rhel7/environment.sh @@ -270,7 +270,7 @@ fi export ATDM_CONFIG_HDF5_LIBS="${HDF5_ROOT}/lib/libhdf5_hl.${ATDM_CONFIG_TPL_LIB_EXT};${HDF5_ROOT}/lib/libhdf5.${ATDM_CONFIG_TPL_LIB_EXT};${SEMS_ZLIB_ROOT}/lib/libz.${ATDM_CONFIG_TPL_LIB_EXT};-ldl" -export ATDM_CONFIG_NETCDF_LIBS="${SEMS_NETCDF_ROOT}/lib/libnetcdf.${ATDM_CONFIG_TPL_LIB_EXT};${PNETCDF_ROOT}/lib/libpnetcdf.${ATDM_CONFIG_TPL_LIB_EXT};${ATDM_CONFIG_HDF5_LIBS};-lcurl" +export ATDM_CONFIG_NETCDF_LIBS="${SEMS_NETCDF_ROOT}/lib/libnetcdf.${ATDM_CONFIG_TPL_LIB_EXT};${PNETCDF_ROOT}/lib/libpnetcdf.a;${ATDM_CONFIG_HDF5_LIBS};-lcurl" # NOTE: SEMS does not provide the correct *.so files for NetCDF so we can't # use them in a shared lib build :-(