File tree Expand file tree Collapse file tree 1 file changed +7
-6
lines changed
Expand file tree Collapse file tree 1 file changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -62,8 +62,6 @@ if(NOT NetCDF_C_LIBRARY)
6262 return ()
6363endif ()
6464
65- find_package (ZLIB)
66-
6765set (CMAKE_REQUIRED_FLAGS)
6866set (CMAKE_REQUIRED_INCLUDES ${NetCDF_C_INCLUDE_DIR} )
6967
@@ -72,10 +70,7 @@ if(ZLIB_FOUND)
7270 list (APPEND CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES} )
7371endif ()
7472
75- list (APPEND CMAKE_REQUIRED_LIBRARIES ${CMAKE_DL_LIBS} )
76-
77- find_package (Threads)
78- list (APPEND CMAKE_REQUIRED_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} )
73+ list (APPEND CMAKE_REQUIRED_LIBRARIES ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} )
7974
8075if (UNIX )
8176 list (APPEND CMAKE_REQUIRED_LIBRARIES m)
@@ -149,6 +144,10 @@ endfunction(netcdf_fortran)
149144#============================================================
150145# main program
151146
147+ find_package (ZLIB)
148+ find_package (Threads)
149+ # top scope so can be reused
150+
152151netcdf_c()
153152
154153set (_ncdf_req ${NetCDF_C_LIBRARY} )
@@ -182,6 +181,7 @@ if(NetCDF_FOUND)
182181 )
183182
184183 target_link_libraries (NetCDF::NetCDF_C INTERFACE
184+ $<$<BOOL :${ZLIB_FOUND} >:${ZLIB_LIBRARIES} >
185185 ${CMAKE_THREAD_LIBS_INIT}
186186 ${CMAKE_DL_LIBS}
187187 $<$<BOOL :${UNIX} >:m>
@@ -199,6 +199,7 @@ if(NetCDF_FOUND)
199199 )
200200
201201 target_link_libraries (NetCDF::NetCDF_Fortran INTERFACE
202+ $<$<BOOL :${ZLIB_FOUND} >:${ZLIB_LIBRARIES} >
202203 ${CMAKE_THREAD_LIBS_INIT}
203204 ${CMAKE_DL_LIBS}
204205 $<$<BOOL :${UNIX} >:m>
You can’t perform that action at this time.
0 commit comments