diff --git a/cmake/std/atdm/ATDMDevEnvSettings.cmake b/cmake/std/atdm/ATDMDevEnvSettings.cmake index 7332d6d20bf5..bf986b9946d0 100644 --- a/cmake/std/atdm/ATDMDevEnvSettings.cmake +++ b/cmake/std/atdm/ATDMDevEnvSettings.cmake @@ -17,6 +17,8 @@ IF (NOT "$ENV{ATDM_CONFIG_COMPLETED_ENV_SETUP}" STREQUAL "TRUE") ENDIF() ATDM_SET_ATDM_VAR_FROM_ENV_AND_DEFAULT(ENABLE_SPARC_SETTINGS OFF) +ATDM_SET_ATDM_VAR_FROM_ENV_AND_DEFAULT(USE_SPARC_TPL_FIND_SETTINGS + ${ATDM_ENABLE_SPARC_SETTINGS}) ASSERT_DEFINED(ENV{ATDM_CONFIG_JOB_NAME}) @@ -287,7 +289,7 @@ ATDM_SET_CACHE(CGNS_INCLUDE_DIRS "$ENV{CGNS_ROOT}/include" CACHE FILEPATH) ATDM_SET_CACHE(CGNS_LIBRARY_DIRS "$ENV{CGNS_ROOT}/lib" CACHE FILEPATH) # HDF5 -IF (ATDM_ENABLE_SPARC_SETTINGS) +IF (ATDM_USE_SPARC_TPL_FIND_SETTINGS) # SPARC ATDM Trilinos configuration does not actually enable HDF5 TPL! ATDM_SET_ENABLE(TPL_ENABLE_HDF5 OFF) ELSE() @@ -303,7 +305,7 @@ ENDIF() # Netcdf ATDM_SET_ENABLE(TPL_ENABLE_Netcdf ON) -IF (ATDM_ENABLE_SPARC_SETTINGS) +IF (ATDM_USE_SPARC_TPL_FIND_SETTINGS) # SPARC ATDM Trilinos configuration has SEACAS-customized FindNetCDF.cmake # module recurrsively find PNetCDF and HDF5 internally! ATDM_SET_CACHE(HDF5_ROOT "$ENV{HDF5_ROOT}" CACHE FILEPATH) diff --git a/cmake/std/atdm/cee-rhel6/environment.sh b/cmake/std/atdm/cee-rhel6/environment.sh index 65ef1bfb0c23..c387bc43254f 100755 --- a/cmake/std/atdm/cee-rhel6/environment.sh +++ b/cmake/std/atdm/cee-rhel6/environment.sh @@ -140,6 +140,13 @@ export ATDM_CONFIG_LAPACK_LIBS=${ATDM_CONFIG_BLAS_LIBS} # NOTE: HDF5_ROOT and NETCDF_ROOT should already be set in env from above # module loads! +# Set the direct libs for HDF5 and NetCDF in case we use that option for +# building (see env var ATDM_CONFIG_USE_SPARC_TPL_FIND_SETTINGS). + +export ATDM_CONFIG_HDF5_LIBS="-L${HDF5_ROOT}/lib;${HDF5_ROOT}/lib/libhdf5_hl.a;${HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl" + +export ATDM_CONFIG_NETCDF_LIBS="-L${BOOST_ROOT}/lib;-L${NETCDF_ROOT}/lib;-L${NETCDF_ROOT}/lib;-L${SEMS_PNETCDF_ROOT}/lib;-L${HDF5_ROOT}/lib;${BOOST_ROOT}/lib/libboost_program_options.a;${BOOST_ROOT}/lib/libboost_system.a;${NETCDF_ROOT}/lib/libnetcdf.a;${PNETCDF_ROOT}/lib/libpnetcdf.a;${HDF5_ROOT}/lib/libhdf5_hl.a;${HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl;-lcurl" + export ATDM_CONFIG_MPI_PRE_FLAGS="--bind-to;none" export ATDM_CONFIG_COMPLETED_ENV_SETUP=TRUE