now fixing for flib

ESMCI · Aug 27, 2020 · 1bb4b57 · 1bb4b57
1 parent 510e955
commit 1bb4b57
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/cmake_config.h.in b/cmake_config.h.in
@@ -30,18 +30,21 @@
 
 #define USE_VARD @USE_VARD@
 
+/* Does netCDF support netCDF/HDF5 files? */
 #cmakedefine HAVE_NETCDF4
+
+/* Does netCDF support parallel I/O for netCDF/HDF5 files? */
 #cmakedefine HAVE_NETCDF_PAR
 
+/* Does PIO support netCDF/HDF5 files? */
+#cmakedefine _NETCDF4
+
 /* Does netCDF and HDF5 support parallel I/O filters? */
 #cmakedefine HAVE_PAR_FILTERS
 
 /* Was PIO built with netCDF integration? */
 #cmakedefine NETCDF_INTEGRATION
 
-/* Does PIO support netCDF/HDF5 files? */
-#cmakedefine _NETCDF4
-
 /* Does PIO support using pnetcdf for I/O? */
 #cmakedefine _PNETCDF
 

diff --git a/src/flib/CMakeLists.txt b/src/flib/CMakeLists.txt
@@ -216,14 +216,14 @@ endif ()
 if (NetCDF_Fortran_FOUND)
   target_include_directories (piof
     PUBLIC ${NetCDF_Fortran_INCLUDE_DIRS})
-  target_compile_definitions (piof
-    PUBLIC _NETCDF)
+  # target_compile_definitions (piof
+  #   PUBLIC _NETCDF)
   target_link_libraries (piof
     PUBLIC ${NetCDF_Fortran_LIBRARIES})
-  if (EXISTS ${NetCDF_Fortran_INCLUDE_DIR}/netcdf_par.h)
-    target_compile_definitions (piof
-      PUBLIC _NETCDF4)
-  endif ()
+  # if (EXISTS ${NetCDF_Fortran_INCLUDE_DIR}/netcdf_par.h)
+  #   target_compile_definitions (piof
+  #     PUBLIC _NETCDF4)
+  # endif ()
 else ()
   target_compile_definitions (piof
     PUBLIC _NONETCDF)