Skip to content

Commit

Permalink
clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
edwardhartnett committed Aug 27, 2020
1 parent 1b788c9 commit 9d8c81a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 28 deletions.
14 changes: 0 additions & 14 deletions src/clib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,32 +94,21 @@ endif ()
if (NetCDF_C_FOUND)
target_include_directories (pioc
PUBLIC ${NetCDF_C_INCLUDE_DIRS})
# target_compile_definitions (pioc
# PUBLIC _NETCDF)
target_link_libraries (pioc
PUBLIC ${NetCDF_C_LIBRARIES})
#if (${NetCDF_C_HAS_PARALLEL})
# target_compile_definitions (pioc
# PUBLIC _NETCDF4)
#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)
endif ()

#===== PnetCDF-C =====
if (PnetCDF_C_FOUND)
target_include_directories (pioc
PUBLIC ${PnetCDF_C_INCLUDE_DIRS})
# target_compile_definitions (pioc
# PUBLIC _PNETCDF)
target_link_libraries (pioc
PUBLIC ${PnetCDF_C_LIBRARIES})

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

#===== Add EXTRAs =====
Expand Down
14 changes: 0 additions & 14 deletions src/flib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -216,25 +216,14 @@ endif ()
if (NetCDF_Fortran_FOUND)
target_include_directories (piof
PUBLIC ${NetCDF_Fortran_INCLUDE_DIRS})
# 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 ()
# else ()
# target_compile_definitions (piof
# PUBLIC _NONETCDF)
endif ()

#===== PnetCDF =====
if (PnetCDF_Fortran_FOUND)
target_include_directories (piof
PUBLIC ${PnetCDF_Fortran_INCLUDE_DIRS})
# target_compile_definitions (piof
# PUBLIC _PNETCDF)
target_link_libraries (piof
PUBLIC ${PnetCDF_Fortran_LIBRARIES})

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

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

0 comments on commit 9d8c81a

Please sign in to comment.