4 files changed, 33 insertions, 27 deletions

diff --git a/contrib/ada/CMakeLists.txt b/contrib/ada/CMakeLists.txt
index 3ede5f9..a0dcf0c 100644
--- a/contrib/ada/CMakeLists.txt
+++ b/contrib/ada/CMakeLists.txt
@@ -46,21 +46,24 @@ function(ZLIB_ADA_findTestEnv testName)
 endfunction(ZLIB_ADA_findTestEnv testName)
 
 if(ZLIB_ADA_BUILD_SHARED)
-    ada_add_library(zlib-Ada SHARED
+    ada_add_library(zlib_ada_Ada SHARED
         zlib-thin.adb
         zlib.adb)
 
-    target_link_libraries(zlib-Ada
+    set_target_properties(zlib_ada_Ada
+        PROPERTIES OUTPUT_NAME zlib-ada)
+
+    target_link_libraries(zlib_ada_Ada
         INTERFACE ZLIB::ZLIB)
 
-    ada_add_library(zlib-streams SHARED
+    ada_add_library(zlib_ada_streams SHARED
         zlib-streams.adb)
 
-    target_link_libraries(zlib-streams
+    target_link_libraries(zlib_ada_streams
         PUBLIC
-            zlib-Ada)
+            zlib_ada_Ada)
 
-    ada_find_ali(zlib-streams)
+    ada_find_ali(zlib_ada_streams)
 
     if(ZLIB_ADA_BUILD_TESTING)
         enable_testing()
@@ -142,24 +145,24 @@ if(ZLIB_ADA_BUILD_SHARED)
 endif(ZLIB_ADA_BUILD_SHARED)
 
 if(ZLIB_ADA_BUILD_STATIC)
-    ada_add_library(zlib-AdaStatic STATIC
+    ada_add_library(zlib_ada_AdaStatic STATIC
         zlib-thin.adb
         zlib.adb)
 
-    target_link_libraries(zlib-AdaStatic
+    target_link_libraries(zlib_ada_AdaStatic
         INTERFACE ZLIB::ZLIBSTATIC)
 
-    set_target_properties(zlib-AdaStatic
-        PROPERTIES OUTPUT_NAME zlib-Ada${zlib_Ada_static_suffix})
+    set_target_properties(zlib_ada_AdaStatic
+        PROPERTIES OUTPUT_NAME zlib-ada${zlib_Ada_static_suffix})
 
-    ada_add_library(zlib-streamsStatic STATIC
+    ada_add_library(zlib_ada_streamsStatic STATIC
         zlib-streams.adb)
 
-    target_link_libraries(zlib-streamsStatic
+    target_link_libraries(zlib_ada_streamsStatic
         PUBLIC
-            zlib-AdaStatic)
+            zlib_ada_AdaStatic)
 
-    ada_find_ali(zlib-streamsStatic)
+    ada_find_ali(zlib_ada_streamsStatic)
 
     if(ZLIB_ADA_BUILD_TESTING)
         enable_testing()
diff --git a/contrib/blast/CMakeLists.txt b/contrib/blast/CMakeLists.txt
index a917eb8..092c5e2 100644
--- a/contrib/blast/CMakeLists.txt
+++ b/contrib/blast/CMakeLists.txt
@@ -36,7 +36,7 @@ function(blast_findTestEnv testName)
 endfunction(blast_findTestEnv testName)
 
 if(ZLIB_BLAST_BUILD_SHARED)
-    add_library(blast SHARED
+    add_library(zlib_blast_blast SHARED
                 blast.c
                 blast.h)
 
@@ -56,12 +56,12 @@ if(ZLIB_BLAST_BUILD_SHARED)
 
     if(ZLIB_BLAST_BUILD_TESTING)
         enable_testing()
-        add_executable(blast-test blast-test.c)
-        target_link_libraries(blast-test blast)
+        add_executable(zlib_blast_blast-test blast-test.c)
+        target_link_libraries(zlib_blast_blast-test PRIVATE zlib_blast_blast)
 
-        add_test(NAME blast_blast-test
+        add_test(NAME zlib_blast_blast-test
             COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
-                    "$<TARGET_FILE:blast-test>"
+                    "$<TARGET_FILE:zlib_blast_blast-test>"
                     "${CMAKE_CURRENT_SOURCE_DIR}"
                     "${CMAKE_CURRENT_BINARY_DIR}")
 
@@ -69,7 +69,7 @@ if(ZLIB_BLAST_BUILD_SHARED)
            OR MSYS
            OR MINGW
            OR CYGWIN)
-            blast_findtestenv(blast-test)
+            blast_findtestenv(zlib_blast_blast-test)
         endif(
             MSVC
             OR MSYS
@@ -79,7 +79,7 @@ if(ZLIB_BLAST_BUILD_SHARED)
 endif(ZLIB_BLAST_BUILD_SHARED)
 
 if(ZLIB_BLAST_BUILD_STATIC)
-    add_library(blastStatic STATIC
+    add_library(zlib_blast_blastStatic STATIC
                 blast.c
                 blast.h)
 
diff --git a/contrib/iostream3/CMakeLists.txt b/contrib/iostream3/CMakeLists.txt
index 65f19e5..c0dbdca 100644
--- a/contrib/iostream3/CMakeLists.txt
+++ b/contrib/iostream3/CMakeLists.txt
@@ -33,7 +33,7 @@ if(WIN32 OR CYGWIN)
 endif(WIN32 OR CYGWIN)
 
 if(ZLIB_IOSTREAM3_BUILD_SHARED)
-    add_library(zlib-iostream3 SHARED
+    add_library(zlib_iostream3_iostreamv3 SHARED
                 zfstream.cc
                 zfstream.h)
 
@@ -72,7 +72,7 @@ if(ZLIB_IOSTREAM3_BUILD_SHARED)
 endif(ZLIB_IOSTREAM3_BUILD_SHARED)
 
 if(ZLIB_IOSTREAM3_BUILD_STATIC)
-    add_library(zlib-iostream3Static STATIC
+    add_library(zlib_iostream3_iostreamv3Static STATIC
                 zfstream.cc
                 zfstream.h)
 
diff --git a/contrib/puff/CMakeLists.txt b/contrib/puff/CMakeLists.txt
index 0733d43..866d3f7 100644
--- a/contrib/puff/CMakeLists.txt
+++ b/contrib/puff/CMakeLists.txt
@@ -33,7 +33,7 @@ if(WIN32 OR CYGWIN)
 endif(WIN32 OR CYGWIN)
 
 if(ZLIB_PUFF_BUILD_TESTING)
-    add_executable(bin-writer bin-writer.c)
+    add_executable(zlib_puff_bin-writer bin-writer.c)
 
     if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR
        ${CMAKE_C_COMPILER_ID} STREQUAL "Clang")
@@ -62,7 +62,7 @@ if(ZLIB_PUFF_BUILD_TESTING)
 endif(ZLIB_PUFF_BUILD_TESTING)
 
 if(ZLIB_PUFF_BUILD_SHARED)
-    add_library(zlib-puff SHARED
+    add_library(zlib_puff_puff SHARED
                 puff.c
                 puff.h)
 
@@ -115,13 +115,16 @@ if(ZLIB_PUFF_BUILD_SHARED)
 endif(ZLIB_PUFF_BUILD_SHARED)
 
 if(ZLIB_PUFF_BUILD_STATIC)
-    add_library(zlib-puffStatic STATIC
+    add_library(zlib_puff_puffStatic STATIC
                 puff.c
                 puff.h)
 
     add_library(PUFF::PUFFSTATIC ALIAS zlib_puff_puffStatic)
+
+    set_target_properties(zlib_puff_puffStatic
         PROPERTIES
-            OUTPUT_NAME zlib-puff${zlib_puff_static_suffix})
+            EXPORT_NAME PUFFSTATIC
+            OUTPUT_NAME puff${zlib_puff_static_suffix})
 
     if(ZLIB_PUFF_BUILD_TESTING)
         enable_testing()