From: Mika Lindqvist Date: Sat, 22 May 2021 05:38:46 +0000 (+0300) Subject: Only when using Visual C++, the static library name should be "zlibstatic" X-Git-Tag: 2.0.4~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c65dce35f0e109a6e05413730bfe698c8bf6407;p=thirdparty%2Fzlib-ng.git Only when using Visual C++, the static library name should be "zlibstatic" * On CygWin, MSYS and MinGW, the static library name should be "z" like on other Unix-like systems --- diff --git a/CMakeLists.txt b/CMakeLists.txt index a33fc1740..a9b51438a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -992,7 +992,24 @@ foreach(ZLIB_INSTALL_LIBRARY ${ZLIB_INSTALL_LIBRARIES}) endforeach() if(WIN32) - set_target_properties(${ZLIB_INSTALL_LIBRARIES} PROPERTIES OUTPUT_NAME zlib${SUFFIX}) + # Shared library + if(NOT DEFINED BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS) + set_target_properties(zlib PROPERTIES OUTPUT_NAME zlib${SUFFIX}) + endif() + # Static library + if(NOT DEFINED BUILD_SHARED_LIBS) + if(MSVC) + set_target_properties(zlibstatic PROPERTIES OUTPUT_NAME zlibstatic${SUFFIX}) + else() + set_target_properties(zlibstatic PROPERTIES OUTPUT_NAME z${SUFFIX}) + endif() + elseif(NOT BUILD_SHARED_LIBS) + if(MSVC) + set_target_properties(zlib PROPERTIES OUTPUT_NAME zlibstatic${SUFFIX}) + else() + set_target_properties(zlib PROPERTIES OUTPUT_NAME z${SUFFIX}) + endif() + endif() else() # On unix-like platforms the library is almost always called libz set_target_properties(${ZLIB_INSTALL_LIBRARIES} PROPERTIES OUTPUT_NAME z${SUFFIX})