File tree 1 file changed +7
-6
lines changed
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)
62
62
return ()
63
63
endif ()
64
64
65
- find_package (ZLIB)
66
-
67
65
set (CMAKE_REQUIRED_FLAGS)
68
66
set (CMAKE_REQUIRED_INCLUDES ${NetCDF_C_INCLUDE_DIR} )
69
67
@@ -72,10 +70,7 @@ if(ZLIB_FOUND)
72
70
list (APPEND CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES} )
73
71
endif ()
74
72
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} )
79
74
80
75
if (UNIX )
81
76
list (APPEND CMAKE_REQUIRED_LIBRARIES m)
@@ -149,6 +144,10 @@ endfunction(netcdf_fortran)
149
144
#============================================================
150
145
# main program
151
146
147
+ find_package (ZLIB)
148
+ find_package (Threads)
149
+ # top scope so can be reused
150
+
152
151
netcdf_c()
153
152
154
153
set (_ncdf_req ${NetCDF_C_LIBRARY} )
@@ -182,6 +181,7 @@ if(NetCDF_FOUND)
182
181
)
183
182
184
183
target_link_libraries (NetCDF::NetCDF_C INTERFACE
184
+ $<$<BOOL :${ZLIB_FOUND} >:${ZLIB_LIBRARIES} >
185
185
${CMAKE_THREAD_LIBS_INIT}
186
186
${CMAKE_DL_LIBS}
187
187
$<$<BOOL :${UNIX} >:m>
@@ -199,6 +199,7 @@ if(NetCDF_FOUND)
199
199
)
200
200
201
201
target_link_libraries (NetCDF::NetCDF_Fortran INTERFACE
202
+ $<$<BOOL :${ZLIB_FOUND} >:${ZLIB_LIBRARIES} >
202
203
${CMAKE_THREAD_LIBS_INIT}
203
204
${CMAKE_DL_LIBS}
204
205
$<$<BOOL :${UNIX} >:m>
You can’t perform that action at this time.
0 commit comments