Merge pull request #317 from sandialabs/tribits-snapshot

Tribits snapshot

TPLsList.cmake

@@ -55,6 +55,8 @@
 SET( Seacas_TPLS_FINDMODS_CLASSIFICATIONS
   GTest           "cmake/TPLs/"    PT
   Zlib            "cmake/TPLs/"    SS
+  Pthread         "cmake/TPLs/"    PT
+  MPI             "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/" PT
   HDF5            "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/"  SS
   Pnetcdf         "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/"  SS
   Netcdf          "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/"  SS

cmake-config

@@ -297,11 +297,6 @@ HAVE_X11=$(check_valid HAVE_X11)
 THREADSAFE=${THREADSAFE:-NO}
 THREADSAFE=$(check_valid THREADSAFE)
 
-if [ "$THREADSAFE" == "YES" ] ; then
-  THREAD_SAFE_OPT="-DTPL_Pthread_LIBRARIES=-lpthread"
-fi
-
-
 function check_enable()
 {
     local path=$1

cmake-sems

@@ -59,9 +59,6 @@ PYTHON_VER=${PYTHON_VER:-"3.0"}
 ### Set to YES to enable the building of a thread-safe version of the Exodus and IOSS libraries.
 THREADSAFE=${THREADSAFE:-NO}
 THREADSAFE=$(check_valid THREADSAFE)
-if [ "$THREADSAFE" == "YES" ] ; then
-  THREAD_SAFE_OPT="-DTPL_Pthread_LIBRARIES=-lpthread"
-fi
 
 ### The SEACAS code will install in ${INSTALL_PATH}/bin, ${INSTALL_PATH}/lib, and ${INSTALL_PATH}/include.
 INSTALL_PATH=${ACCESS}
@@ -72,7 +69,8 @@ INSTALL_PATH=${ACCESS}
 module purge
 module load sems-env
 module load sems-gcc/9.2.0
-module load sems-cmake/3.19.1
+module load sparc-cmake/3.23.2
+#module load sems-cmake/3.19.1
 module load sems-doxygen
 module load sems-zlib/1.2.8/base
 
@@ -183,11 +181,10 @@ cmake  \
 -D TPL_ENABLE_CGNS:BOOL=${HAVE_CGNS} \
 -D TPL_ENABLE_MPI:BOOL=${MPI} \
 -D TPL_ENABLE_Pamgen:BOOL=OFF \
--D TPL_ENABLE_fmt:BOOL=ON \
 -D TPL_ENABLE_Pthread:BOOL=${THREADSAFE} \
 -D SEACASExodus_ENABLE_THREADSAFE:BOOL=${THREADSAFE} \
 -D SEACASIoss_ENABLE_THREADSAFE:BOOL=${THREADSAFE} \
-${THREAD_SAFE_OPT} \
+-D TPL_ENABLE_fmt:BOOL=ON \
 -D TPL_ENABLE_X11:BOOL=${HAVE_X11} \
 -D PythonInterp_FIND_VERSION:STRING=${PYTHON_VER} \
 \

cmake/TPLs/FindTPLGTest.cmake

@@ -2,7 +2,7 @@
 # ************************************************************************
 #
 #            Trilinos: An Object-Oriented Solver Framework
-#                 Copyright (2001) Sandia Corporation
+#                 Copyright (2001, 2022) Sandia Corporation
 #
 #
 # Copyright (2001) Sandia Corporation. Under the terms of Contract
@@ -53,37 +53,7 @@
 # ************************************************************************
 # @HEADER
 
-# First, set up the variables for the (backward-compatible) TriBITS way of
-# finding GTest.  These are used in case FIND_PACKAGE(GTest ...) is
-# not called or does not find GTest.  Also, these variables need to be
-# non-null in order to trigger the right behavior in the function
-# TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES().
-set(REQUIRED_HEADERS gtest.h)
-set(REQUIRED_LIBS_NAMES gtest)
-
-# Second, search for GTest components (if allowed) using the standard
-# FIND_PACKAGE(GTest ...).
-tribits_tpl_allow_pre_find_package(GTest  GTest_ALLOW_PREFIND)
-if (GTest_ALLOW_PREFIND)
-  message("-- Using FIND_PACKAGE(GTest ...) ...") 
-  find_package(GTest CONFIG)
-  if (GTest_FOUND)
-    get_target_property(GTest_INCLUDE_DIRS GTest::gtest INTERFACE_INCLUDE_DIRECTORIES)
-    get_target_property(GTest_CONFIGURATION GTest::gtest IMPORTED_CONFIGURATIONS)
-    get_target_property(GTest_LIBRARIES GTest::gtest IMPORTED_LOCATION_${GTest_CONFIGURATION})
-    # Tell TriBITS that we found GTest and there no need to look any further!
-    set(TPL_GTest_INCLUDE_DIRS ${GTest_INCLUDE_DIRS} CACHE PATH "...")
-    set(TPL_GTest_LIBRARIES ${GTest_LIBRARIES} CACHE FILEPATH "...")
-    set(TPL_GTest_LIBRARY_DIRS ${GTest_LIBRARY_DIRS} CACHE PATH "...")
-  endif()
-endif()
-
-# Third, call `tribits_tpl_find_include_dirs_and_libraries()`
-tribits_tpl_find_include_dirs_and_libraries( GTest
-  REQUIRED_HEADERS ${REQUIRED_HEADERS}
-  REQUIRED_LIBS_NAMES ${REQUIRED_LIBS_NAMES}
-  )
-# NOTE: If `find_package(GTest ...)` was called and successfully found
-# GTest, then `tribits_tpl_find_include_dirs_and_libraries()` will use the
-# already-set variables and just print them out.  This is the final "hook"
-# into the TriBITS TPL system.
+find_package(GTest CONFIG REQUIRED)
+tribits_extpkg_create_imported_all_libs_target_and_config_file(GTest
+  INNER_FIND_PACKAGE_NAME  GTest
+  IMPORTED_TARGETS_FOR_ALL_LIBS  GTest::gtest )