Skip to content

Commit a525706

Browse files
authored
Merge pull request #662 from Kitware/fix-static-zlib-target
Conditionally update zlib name in get_system_library_name
2 parents 7ba1a85 + cd13a66 commit a525706

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

CMake/External_PNG.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ add_package_dependency(
88
)
99
if(NOT ZLIB_FOUND)
1010
set(ZLIB_INCLUDE_DIRS ${fletch_BUILD_INSTALL_PREFIX}/include)
11-
get_system_library_name(zlib zlib_lib)
11+
if (BUILD_SHARED_LIBS)
12+
get_system_library_name(zlib zlib_lib)
13+
else()
14+
get_system_library_name(z zlib_lib)
15+
endif()
1216
set(ZLIB_LIBRARIES ${fletch_BUILD_INSTALL_PREFIX}/lib/${zlib_lib})
1317
endif()
1418
set(png_cmake_args ${png_cmake_args}

0 commit comments

Comments
 (0)