ufs-community · GeorgeGayno-NOAA · Sep 14, 2020 · Jun 16, 2020 · Jun 16, 2020 · Jun 17, 2020
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,10 @@
+build/
+install/
+
+*.[ao]
+*.mod
+*.so
+*.exe
+*.x
+
+*.swp
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "cmake"]
-	path = cmake
+	path = CMakeModules
 	url = https://github.com/NOAA-EMC/CMakeModules
-	branch = release/public-v1
+	branch = feature/cmakepkgs
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ project(
   ufs_util
   VERSION ${pVersion}
   LANGUAGES C Fortran)
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/Modules")
 
 if(NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel)$")
   message(STATUS "Setting build type to 'Release' as none was specified.")
@@ -17,11 +17,7 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel)$")
                                                "MinSizeRel" "RelWithDebInfo")
 endif()
 
-if(NOT CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|GNU|Clang|AppleClang)$")
-  message(WARNING "Compiler not officially supported: ${CMAKE_Fortran_COMPILER_ID}")
-endif()
-
-if(NOT CMAKE_C_COMPILER_ID MATCHES "^(Intel|GNU)$")
+if(NOT CMAKE_C_COMPILER_ID MATCHES "^(Intel|GNU|Clang|AppleClang)$")
   message(WARNING "Compiler not officially supported: ${CMAKE_C_COMPILER_ID}")
 endif()
 
@@ -49,7 +45,7 @@ find_package(PNG REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(Jasper REQUIRED)
 find_package(NetCDF REQUIRED C Fortran)
-find_package(MPI REQUIRED )
+find_package(MPI REQUIRED)
 find_package(ESMF MODULE REQUIRED)
 find_package(WGRIB2 REQUIRED)
 
@@ -58,55 +54,18 @@ if(OPENMP)
   find_package(OpenMP REQUIRED COMPONENTS Fortran)
 endif()
 
-set(CMAKE_FIND_PACKAGE_PREFER_CONFIG true)
-
-if(NOT TARGET gfsio_4)
-  find_package(gfsio REQUIRED)
-endif()
-
-if(NOT TARGET sfcio_4)
-  find_package(sfcio REQUIRED)
-endif()
-
-if(NOT TARGET w3nco_d)
-  find_package(w3nco REQUIRED)
-endif()
-
-if(NOT TARGET landsfcutil_d)
-  find_package(landsfcutil REQUIRED)
-endif()
-
-if(NOT TARGET bacio_4)
-  find_package(bacio REQUIRED)
-endif()
-
-if(NOT TARGET nemsio)
-  find_package(nemsio REQUIRED)
-endif()
-
-if(NOT TARGET nemsiogfs)
-  find_package(nemsiogfs REQUIRED)
-endif()
-
-if(NOT TARGET sigio_4)
-  find_package(sigio REQUIRED)
-endif()
-
-if(NOT TARGET sp_d)
-  find_package(sp REQUIRED)
-endif()
-
-if(NOT TARGET ip_d)
-  find_package(ip REQUIRED)
-endif()
-
-if(NOT TARGET w3emc_d)
-  find_package(w3emc REQUIRED)
-endif()
-
-if(NOT TARGET g2_d)
-  find_package(g2 REQUIRED)
-endif()
+find_package(gfsio REQUIRED)
+find_package(sfcio REQUIRED)
+find_package(w3nco REQUIRED)
+find_package(landsfcutil REQUIRED)
+find_package(bacio REQUIRED)
+find_package(nemsio REQUIRED)
+find_package(nemsiogfs REQUIRED)
+find_package(sigio REQUIRED)
+find_package(sp REQUIRED)
+find_package(ip REQUIRED)
+find_package(w3emc REQUIRED)
+find_package(g2 REQUIRED)
 
 # EMC requires executables in ./exec
 set(exec_dir bin)

diff --git a/CMakeModules b/CMakeModules
diff --git a/cmake b/cmake
diff --git a/sorc/chgres_cube.fd/CMakeLists.txt b/sorc/chgres_cube.fd/CMakeLists.txt
@@ -21,12 +21,12 @@ set(exe_name chgres_cube)
 add_executable(${exe_name} ${fortran_src})
 target_link_libraries(
   ${exe_name}
-  nemsio
-  sfcio_4
-  sigio_4
-  bacio_4
-  sp_d
-  w3nco_d
+  nemsio::nemsio
+  sfcio::sfcio
+  sigio::sigio
+  bacio::bacio_4
+  sp::sp_d
+  w3nco::w3nco_d
   esmf
   wgrib2
   MPI::MPI_Fortran

diff --git a/sorc/emcsfc_ice_blend.fd/CMakeLists.txt b/sorc/emcsfc_ice_blend.fd/CMakeLists.txt
@@ -5,9 +5,9 @@ set(exe_name emcsfc_ice_blend)
 add_executable(${exe_name} ${fortran_src})
 target_link_libraries(
   ${exe_name}
-  bacio_4
-  g2_4
-  w3nco_4
+  bacio::bacio_4
+  g2::g2_4
+  w3nco::w3nco_4
   ${JASPER_LIBRARIES}
   PNG::PNG
   ZLIB::ZLIB)

diff --git a/sorc/emcsfc_snow2mdl.fd/CMakeLists.txt b/sorc/emcsfc_snow2mdl.fd/CMakeLists.txt
@@ -16,12 +16,12 @@ set(exe_name emcsfc_snow2mdl)
 add_executable(${exe_name} ${fortran_src})
 target_link_libraries(
   ${exe_name}
-  g2_d
-  ip_d
-  sp_d
-  landsfcutil_d
-  bacio_4
-  w3nco_d
+  g2::g2_d
+  ip::ip_d
+  sp::sp_d
+  landsfcutil::landsfcutil_d
+  bacio::bacio_4
+  w3nco::w3nco_d
   ${JASPER_LIBRARIES}
   PNG::PNG
   ZLIB::ZLIB)

diff --git a/sorc/global_chgres.fd/CMakeLists.txt b/sorc/global_chgres.fd/CMakeLists.txt
@@ -22,18 +22,20 @@ set(exe_name global_chgres)
 add_executable(${exe_name} ${fortran_src})
 target_link_libraries(
   ${exe_name}
-  gfsio_4
-  nemsiogfs
-  nemsio
-  sigio_4
-  sfcio_4
-  landsfcutil_d
-  ip_d
-  sp_d
-  w3emc_d
-  w3nco_d
-  bacio_4
-  NetCDF::NetCDF_Fortran
-  OpenMP::OpenMP_Fortran)
+  gfsio::gfsio
+  nemsiogfs::nemsiogfs
+  nemsio::nemsio
+  sigio::sigio
+  sfcio::sfcio
+  landsfcutil::landsfcutil_d
+  ip::ip_d
+  sp::sp_d
+  w3emc::w3emc_d
+  w3nco::w3nco_d
+  bacio::bacio_4
+  NetCDF::NetCDF_Fortran)
+if(OpenMP_Fortran_FOUND)
+  target_link_libraries(${exe_name} OpenMP::OpenMP_Fortran)
+endif()
 
 install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir})
diff --git a/sorc/global_cycle.fd/CMakeLists.txt b/sorc/global_cycle.fd/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(fortran_src
-    cycle.f90     
+    cycle.f90
     machine.f90
     num_parthds.f90
     sfcsub.F
@@ -15,12 +15,14 @@ set(exe_name global_cycle)
 add_executable(${exe_name} ${fortran_src})
 target_link_libraries(
   ${exe_name}
-  w3nco_d
-  bacio_4
-  ip_d
-  sp_d
+  w3nco::w3nco_d
+  bacio::bacio_4
+  ip::ip_d
+  sp::sp_d
   MPI::MPI_Fortran
-  NetCDF::NetCDF_Fortran
-  OpenMP::OpenMP_Fortran)
+  NetCDF::NetCDF_Fortran)
+if(OpenMP_Fortran_FOUND)
+  target_link_libraries(${exe_name} OpenMP::OpenMP_Fortran)
+endif()
 
 install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir})
diff --git a/sorc/mkgfsnemsioctl.fd/CMakeLists.txt b/sorc/mkgfsnemsioctl.fd/CMakeLists.txt
@@ -5,8 +5,8 @@ set(exe_name mkgfsnemsioctl)
 add_executable(${exe_name} ${fortran_src})
 target_link_libraries(
   ${exe_name}
-  nemsio
-  bacio_4
-  w3nco_d)
+  nemsio::nemsio
+  bacio::bacio_4
+  w3nco::w3nco_d)
 
 install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir})
diff --git a/sorc/nemsio_chgdate.fd/CMakeLists.txt b/sorc/nemsio_chgdate.fd/CMakeLists.txt
@@ -11,7 +11,7 @@ set(exe_name nemsio_chgdate)
 add_executable(${exe_name} ${fortran_src})
 target_link_libraries(
   ${exe_name}
-  nemsio
-  bacio_4)
+  nemsio::nemsio
+  bacio::bacio_4)
 
 install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir})
diff --git a/sorc/nemsio_get.fd/CMakeLists.txt b/sorc/nemsio_get.fd/CMakeLists.txt
@@ -11,8 +11,8 @@ set(exe_name nemsio_get)
 add_executable(${exe_name} ${fortran_src})
 target_link_libraries(
   ${exe_name}
-  nemsio
-  bacio_4
-  w3nco_d)
+  nemsio::nemsio
+  bacio::bacio_4
+  w3nco::w3nco_d)
 
 install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir})
diff --git a/sorc/nemsio_read.fd/CMakeLists.txt b/sorc/nemsio_read.fd/CMakeLists.txt
@@ -5,8 +5,8 @@ set(exe_name nemsio_read)
 add_executable(${exe_name} ${fortran_src})
 target_link_libraries(
   ${exe_name}
-  nemsio
-  bacio_4
-  w3nco_d)
+  nemsio::nemsio
+  bacio::bacio_4
+  w3nco::w3nco_d)
 
 install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir})
diff --git a/sorc/nst_tf_chg.fd/CMakeLists.txt b/sorc/nst_tf_chg.fd/CMakeLists.txt
@@ -16,9 +16,9 @@ set(exe_name nst_tf_chg)
 add_executable(${exe_name} ${fortran_src})
 target_link_libraries(
   ${exe_name}
-  nemsio
-  w3nco_d
-  bacio_4
+  nemsio::nemsio
+  w3nco::w3nco_d
+  bacio::bacio_4
   NetCDF::NetCDF_Fortran)
 
 install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir})
diff --git a/sorc/orog.fd/CMakeLists.txt b/sorc/orog.fd/CMakeLists.txt
@@ -12,10 +12,10 @@ set(exe_name orog)
 add_executable(${exe_name} ${fortran_src})
 target_link_libraries(
   ${exe_name}
-  bacio_4
-  w3nco_d
-  ip_d
-  sp_d
+  bacio::bacio_4
+  w3nco::w3nco_d
+  ip::ip_d
+  sp::sp_d
   NetCDF::NetCDF_Fortran)
 if(OpenMP_Fortran_FOUND)
   target_link_libraries(${exe_name} OpenMP::OpenMP_Fortran)