Skip to content

Commit

Permalink
more fixing for flib and clib
Browse files Browse the repository at this point in the history
  • Loading branch information
edwardhartnett committed Aug 27, 2020
1 parent 1bb4b57 commit e6960d9
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
16 changes: 8 additions & 8 deletions src/clib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,20 +98,20 @@ if (NetCDF_C_FOUND)
# PUBLIC _NETCDF)
target_link_libraries (pioc
PUBLIC ${NetCDF_C_LIBRARIES})
if (${NetCDF_C_HAS_PARALLEL})
#if (${NetCDF_C_HAS_PARALLEL})
# target_compile_definitions (pioc
# PUBLIC _NETCDF4)
endif ()
#endif ()
if (${NetCDF_C_LOGGING_ENABLED})
target_compile_definitions (pioc
PUBLIC NETCDF_C_LOGGING_ENABLED)
# netcdf.h needs this to be defined to use netCDF logging.
target_compile_definitions (pioc
PUBLIC LOGGING)
endif()
else ()
target_compile_definitions (pioc
PUBLIC _NONETCDF)
# else ()
# target_compile_definitions (pioc
# PUBLIC _NONETCDF)
endif ()

#===== PnetCDF-C =====
Expand All @@ -131,9 +131,9 @@ if (PnetCDF_C_FOUND)
PUBLIC USE_PNETCDF_VARN
PUBLIC USE_PNETCDF_VARN_ON_READ)
endif()
else ()
target_compile_definitions (pioc
PUBLIC _NOPNETCDF)
# else ()
# target_compile_definitions (pioc
# PUBLIC _NOPNETCDF)
endif ()

#===== Add EXTRAs =====
Expand Down
12 changes: 6 additions & 6 deletions src/flib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,9 @@ if (NetCDF_Fortran_FOUND)
# target_compile_definitions (piof
# PUBLIC _NETCDF4)
# endif ()
else ()
target_compile_definitions (piof
PUBLIC _NONETCDF)
# else ()
# target_compile_definitions (piof
# PUBLIC _NONETCDF)
endif ()

#===== PnetCDF =====
Expand All @@ -246,9 +246,9 @@ if (PnetCDF_Fortran_FOUND)
PUBLIC USE_PNETCDF_VARN
PUBLIC USE_PNETCDF_VARN_ON_READ)
endif()
else ()
target_compile_definitions (piof
PUBLIC _NOPNETCDF)
# else ()
# target_compile_definitions (piof
# PUBLIC _NOPNETCDF)
endif ()

#===== Add EXTRAs =====
Expand Down

0 comments on commit e6960d9

Please sign in to comment.