Skip to content

Commit

Permalink
fix errors in CMakeLists.txt when netCDF-4 is ON
Browse files Browse the repository at this point in the history
  • Loading branch information
wkliao committed Jun 26, 2019
1 parent 087671b commit d0c2185
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ ENDMACRO()
# Build a binary used by a script, but don't make a test out of it.
MACRO(build_bin_test F ext)
ADD_EXECUTABLE(${F} ${F}${ext})
TARGET_LINK_LIBRARIES(${F} ncfortran netcdff ${NETCDF_C_LIBRARY})
TARGET_LINK_LIBRARIES(${F} netcdff ${NETCDF_C_LIBRARY})
IF(MSVC)
SET_TARGET_PROPERTIES(${F}
PROPERTIES LINK_FLAGS_DEBUG " /NODEFAULTLIB:MSVCRT"
Expand Down
8 changes: 4 additions & 4 deletions nf03_test4/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ if (USE_NETCDF4)
SET(check_PROGRAMS ${check_PROGRAMS} f90tst_parallel f90tst_parallel2 f90tst_parallel3
f90tst_nc4_par)

build_bin_test(f90tst_parallel ".f90")
build_bin_test(f90tst_parallel2 ".f90")
build_bin_test(f90tst_parallel ".F90")
build_bin_test(f90tst_parallel2 ".F90")
build_bin_test(f90tst_parallel3 ".F90")
build_bin_test(f90tst_nc4_par ".f90")
build_bin_test(f90tst_nc4_par ".F90")

#SET(f90tst_parallel_fill_SOURCES f90tst_parallel_fill.f90)

Expand All @@ -54,7 +54,7 @@ if (USE_NETCDF4)
SET(nc4_io_PROGRAMS f90tst_io)
SET(check_PROGRAMS ${check_PROGRAMS} ${nc4_io_PROGRAMS})
SET(TESTS ${TESTS} ${nc4_io_PROGRAMS})
SET(tst_io_SOURCES f90tst_io.f90)
SET(f90tst_io_SOURCES f90tst_io.f90)
ENDIF(BUILD_BENCHMARKS)
endif(USE_NETCDF4)

Expand Down

0 comments on commit d0c2185

Please sign in to comment.