Skip to content

Commit

Permalink
commented out more unneeded flag setting in cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
edwardhartnett committed Aug 27, 2020
1 parent 6d767b2 commit adf6308
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
20 changes: 10 additions & 10 deletions src/clib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ endif ()
if (NetCDF_C_FOUND)
target_include_directories (pioc
PUBLIC ${NetCDF_C_INCLUDE_DIRS})
# target_compile_definitions (pioc
# PUBLIC _NETCDF)
target_compile_definitions (pioc
PUBLIC _NETCDF)
target_link_libraries (pioc
PUBLIC ${NetCDF_C_LIBRARIES})
# if (${NetCDF_C_HAS_PARALLEL})
Expand All @@ -109,17 +109,17 @@ if (NetCDF_C_FOUND)
target_compile_definitions (pioc
PUBLIC LOGGING)
endif()
# else ()
# target_compile_definitions (pioc
# PUBLIC _NONETCDF)
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_compile_definitions (pioc
PUBLIC _PNETCDF)
target_link_libraries (pioc
PUBLIC ${PnetCDF_C_LIBRARIES})

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
22 changes: 11 additions & 11 deletions src/flib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -233,8 +233,8 @@ endif ()
if (PnetCDF_Fortran_FOUND)
target_include_directories (piof
PUBLIC ${PnetCDF_Fortran_INCLUDE_DIRS})
# target_compile_definitions (piof
# PUBLIC _PNETCDF)
target_compile_definitions (piof
PUBLIC _PNETCDF)
target_link_libraries (piof
PUBLIC ${PnetCDF_Fortran_LIBRARIES})

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 adf6308

Please sign in to comment.