Merge pull request #2501 from chuckatkins/update-tpl

Update Third Party Libraries
ornladios · Nov 3, 2020 · 3db4fa2 · 3db4fa2
2 parents bd6a788 + c3f228a
commit 3db4fa2
Show file tree

Hide file tree

Showing 168 changed files with 25,089 additions and 19,834 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -26,8 +26,6 @@ jobs:
           el7-gnu8-ohpc,
           el7-gnu8-openmpi-ohpc,
           el7-gnu8-openmpi-ohpc-static,
-          suse-pgi,
-          suse-pgi-openmpi,
           debian-sid,
           debian-sid-openmpi ]
         include:
@@ -39,10 +37,6 @@ jobs:
           container: ornladios/adios2:ci-el7-gnu8-openmpi-ohpc
         - jobname: el7-gnu8-openmpi-ohpc-static
           container: ornladios/adios2:ci-el7-gnu8-openmpi-ohpc
-        - jobname: suse-pgi
-          container: ornladios/adios2:ci-suse-pgi
-        - jobname: suse-pgi-openmpi
-          container: ornladios/adios2:ci-suse-pgi-openmpi
         - jobname: debian-sid
           container: ornladios/adios2:ci-debian-sid
         - jobname: debian-sid-openmpi
@@ -77,22 +71,14 @@ jobs:
       matrix:
         jobname: [
           power8-el7-xl,
-          power8-el7-xl-smpi,
-          power8-el7-pgi,
-          power8-el7-pgi-smpi ]
+          power8-el7-xl-smpi ]
         include:
         - jobname: power8-el7-xl
           container: ornladios/adios2:ci-x86_64-power8-el7-xl
           arch: ppc64le
         - jobname: power8-el7-xl-smpi
           container: ornladios/adios2:ci-x86_64-power8-el7-xl-smpi
           arch: ppc64le
-        - jobname: power8-el7-pgi
-          container: ornladios/adios2:ci-x86_64-power8-el7-pgi
-          arch: ppc64le
-        - jobname: power8-el7-pgi-smpi
-          container: ornladios/adios2:ci-x86_64-power8-el7-pgi-smpi
-          arch: ppc64le
 
     steps:
     - name: Emulation Setup

diff --git a/cmake/FindHDF5.cmake b/cmake/FindHDF5.cmake
@@ -4,7 +4,7 @@
 #------------------------------------------------------------------------------#
 
 # This module is already included in new versions of CMake
-if(CMAKE_VERSION VERSION_LESS 3.10)
+if(CMAKE_VERSION VERSION_LESS 3.19)
   include(${CMAKE_CURRENT_LIST_DIR}/upstream/FindHDF5.cmake)
 else()
   include(${CMAKE_ROOT}/Modules/FindHDF5.cmake)

diff --git a/cmake/FindMPI.cmake b/cmake/FindMPI.cmake
@@ -4,7 +4,7 @@
 #------------------------------------------------------------------------------#
 
 # This module is already included in new versions of CMake
-if(CMAKE_VERSION VERSION_LESS 3.17.2)
+if(CMAKE_VERSION VERSION_LESS 3.19)
   include(${CMAKE_CURRENT_LIST_DIR}/upstream/FindMPI.cmake)
 else()
   include(${CMAKE_ROOT}/Modules/FindMPI.cmake)

diff --git a/cmake/FindPkgConfig.cmake b/cmake/FindPkgConfig.cmake
@@ -4,4 +4,8 @@
 #------------------------------------------------------------------------------#
 
 # This module is already included in new versions of CMake
-include(${CMAKE_CURRENT_LIST_DIR}/upstream/FindPkgConfig.cmake)
+if(CMAKE_VERSION VERSION_LESS 3.19)
+  include(${CMAKE_CURRENT_LIST_DIR}/upstream/FindPkgConfig.cmake)
+else()
+  include(${CMAKE_ROOT}/Modules/FindPkgConfig.cmake)
+endif()