Blob Blame History Raw
diff -rupN libzip-1.4.0/lib/CMakeLists.txt libzip-1.4.0-new/lib/CMakeLists.txt
--- libzip-1.4.0/lib/CMakeLists.txt	2017-12-29 13:37:22.000000000 +0100
+++ libzip-1.4.0-new/lib/CMakeLists.txt	2017-12-31 19:43:28.235775853 +0100
@@ -201,6 +201,10 @@ ENDIF(NOT HAVE_MKSTEMP)
 
 ADD_LIBRARY(zip ${LIBZIP_SOURCES} ${LIBZIP_EXTRA_FILES} ${LIBZIP_OPSYS_FILES})
 SET_TARGET_PROPERTIES(zip PROPERTIES VERSION 5.0 SOVERSION 5)
+IF(MINGW)
+    GET_TARGET_PROPERTY(ZIP_SOVERSION zip SOVERSION)
+    SET_TARGET_PROPERTIES(zip PROPERTIES SUFFIX "-${ZIP_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ENDIF(MINGW)
 TARGET_LINK_LIBRARIES(zip ${ZLIB_LIBRARY} ${OPTIONAL_LIBRARY})
 INSTALL(TARGETS zip
   RUNTIME DESTINATION bin
diff -rupN libzip-1.4.0/regress/CMakeLists.txt libzip-1.4.0-new/regress/CMakeLists.txt
--- libzip-1.4.0/regress/CMakeLists.txt	2017-12-29 13:37:22.000000000 +0100
+++ libzip-1.4.0-new/regress/CMakeLists.txt	2017-12-31 19:44:19.822772999 +0100
@@ -32,9 +32,10 @@ ADD_EXECUTABLE(ziptool_regress ziptool_r
 TARGET_LINK_LIBRARIES(ziptool_regress zip)
 
 ADD_LIBRARY(malloc MODULE malloc.c)
-TARGET_LINK_LIBRARIES(malloc ${CMAKE_DL_LIBS})
-ADD_LIBRARY(nonrandomopen MODULE nonrandomopen.c)
-TARGET_LINK_LIBRARIES(nonrandomopen ${CMAKE_DL_LIBS})
+TARGET_LINK_LIBRARIES(malloc dl)
+ADD_LIBRARY(nonrandomopen STATIC nonrandomopen.c)
+TARGET_LINK_LIBRARIES(nonrandomopen dl)
+TARGET_LINK_LIBRARIES(nonrandomopentest nonrandomopen)
 
 FOREACH(PROGRAM ${GETOPT_USERS})
   ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}.c ${SRC_EXTRA_FILES})