Merge pull request #24 from NOAA-EMC/feature/cleanup

cleanup grib_util
NOAA-EMC · Aug 18, 2020 · 57c8107 · 57c8107
2 parents e7c39a8 + 0f5d796
commit 57c8107
Show file tree

Hide file tree

Showing 27 changed files with 27 additions and 519 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
 
 file(STRINGS "VERSION" pVersion)
 
-project(grib_util VERSION ${pVersion} LANGUAGES C Fortran)
+project(gributil VERSION ${pVersion} LANGUAGES C Fortran)
 
 option(OPENMP "use OpenMP threading" OFF)
 
@@ -19,6 +19,12 @@ if(NOT CMAKE_C_COMPILER_ID MATCHES "^(Intel|GNU|Clang|AppleClang)$")
   message(WARNING "Compiler not officially supported: ${CMAKE_C_COMPILER_ID}")
 endif()
 
+if(NOT CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|GNU)$")
+  message(WARNING "Compiler not officially supported: ${CMAKE_Fortran_COMPILER_ID}")
+endif()
+
+include(GNUInstallDirs)
+
 if(OPENMP)
   find_package(OpenMP REQUIRED COMPONENTS Fortran)
 endif()
@@ -27,10 +33,10 @@ find_package(Jasper REQUIRED)
 find_package(PNG REQUIRED)
 find_package(ZLIB REQUIRED)
 
-find_package(w3nco CONFIG REQUIRED)
-find_package(g2 CONFIG REQUIRED)
-find_package(bacio CONFIG REQUIRED)
-find_package(ip CONFIG REQUIRED)
-find_package(sp CONFIG REQUIRED)
+find_package(w3nco REQUIRED)
+find_package(g2 REQUIRED)
+find_package(bacio REQUIRED)
+find_package(ip REQUIRED)
+find_package(sp REQUIRED)
 
 add_subdirectory(sorc)
diff --git a/README.install b/README.install
diff --git a/modulefiles/build_grib_util/cray/1.1.0 b/modulefiles/build_grib_util/cray/1.1.0
diff --git a/modulefiles/build_grib_util/dell/1.1.0 b/modulefiles/build_grib_util/dell/1.1.0
diff --git a/modulefiles/build_grib_util/ibm/1.1.0 b/modulefiles/build_grib_util/ibm/1.1.0
diff --git a/modulefiles/build_grib_util/theia/1.1.0 b/modulefiles/build_grib_util/theia/1.1.0
diff --git a/modulefiles/build_wgrib2/cray/2.0.7 b/modulefiles/build_wgrib2/cray/2.0.7
diff --git a/modulefiles/build_wgrib2/dell/2.0.7 b/modulefiles/build_wgrib2/dell/2.0.7
diff --git a/modulefiles/build_wgrib2/ibm/2.0.7 b/modulefiles/build_wgrib2/ibm/2.0.7
diff --git a/modulefiles/build_wgrib2/theia/2.0.7 b/modulefiles/build_wgrib2/theia/2.0.7
diff --git a/modulefiles/grib_util/cray/1.1.1 b/modulefiles/grib_util/cray/1.1.1
diff --git a/modulefiles/grib_util/cray/1.1.1_nceplibs b/modulefiles/grib_util/cray/1.1.1_nceplibs
diff --git a/modulefiles/grib_util/dell/1.1.1 b/modulefiles/grib_util/dell/1.1.1