5 files changed, 87 insertions, 82 deletions

diff --git a/contrib/ada/CMakeLists.txt b/contrib/ada/CMakeLists.txt
index a0dcf0c..85b9444 100644
--- a/contrib/ada/CMakeLists.txt
+++ b/contrib/ada/CMakeLists.txt
@@ -67,75 +67,75 @@ if(ZLIB_ADA_BUILD_SHARED)
 
     if(ZLIB_ADA_BUILD_TESTING)
         enable_testing()
-        ada_add_executable(ada-test test.adb)
+        ada_add_executable(zlib_ada_test test.adb)
 
-        target_link_libraries(ada-test
+        target_link_libraries(zlib_ada_test
             PRIVATE
-                zlib-Ada
-                zlib-streams)
+                zlib_ada_Ada
+                zlib_ada_streams)
 
-        ada_find_ali(ada-test)
+        ada_find_ali(zlib_ada_test)
 
-        add_test(NAME zlib_Ada_ada-test COMMAND ada-test)
-        set_tests_properties(zlib_Ada_ada-test PROPERTIES FIXTURES_REQUIRED ada_cleanup)
+        add_test(NAME zlib_ada_ada-test COMMAND zlib_ada_test)
+        set_tests_properties(zlib_ada_ada-test PROPERTIES FIXTURES_REQUIRED zlib_ada_cleanup)
 
         if(MSVC
            OR MSYS
            OR MINGW
            OR CYGWIN)
-            zlib_ada_findtestenv(zlibAda_ada-test)
+            zlib_ada_findtestenv(zlib_ada_ada-test)
         endif(
             MSVC
             OR MSYS
             OR MINGW
             OR CYGWIN)
 
-        ada_add_executable(buffer_demo buffer_demo.adb)
+        ada_add_executable(zlib_ada_buffer_demo buffer_demo.adb)
 
-        target_link_libraries(buffer_demo
+        target_link_libraries(zlib_ada_buffer_demo
             PRIVATE
-                zlib-Ada)
+                zlib_ada_Ada)
 
-        ada_find_ali(buffer_demo)
+        ada_find_ali(zlib_ada_buffer_demo)
 
-        add_test(NAME zlib_Ada_buffer-demo COMMAND buffer_demo)
+        add_test(NAME zlib_ada_buffer-demo COMMAND zlib_ada_buffer_demo)
 
         if(MSVC
            OR MSYS
            OR MINGW
            OR CYGWIN)
-            zlib_ada_findtestenv(zlibAda_buffer-demo)
+            zlib_ada_findtestenv(zlib_ada_buffer-demo)
         endif(
             MSVC
             OR MSYS
             OR MINGW
             OR CYGWIN)
 
-        ada_add_executable(mtest mtest.adb)
+        ada_add_executable(zlib_ada_mtest mtest.adb)
 
-        target_link_libraries(mtest
+        target_link_libraries(zlib_ada_mtest
             PRIVATE
-                zlib-Ada)
+                zlib_ada_Ada)
 
-        ada_find_ali(mtest)
+        ada_find_ali(zlib_ada_mtest)
 
         #Not adding test as this is an endless-loop
 
-        ada_add_executable(read read.adb)
+        ada_add_executable(zlib_ada_read read.adb)
 
-        target_link_libraries(read
+        target_link_libraries(zlib_ada_read
             PRIVATE
-                zlib-Ada)
+                zlib_ada_Ada)
 
-        ada_find_ali(read)
+        ada_find_ali(zlib_ada_read)
 
-        add_test(NAME zlib_Ada_read COMMAND read)
+        add_test(NAME zlib_ada_read COMMAND zlib_ada_read)
 
         if(MSVC
            OR MSYS
            OR MINGW
            OR CYGWIN)
-            zlib_ada_findtestenv(zlibAda_read)
+            zlib_ada_findtestenv(zlib_ada_read)
         endif(
             MSVC
             OR MSYS
@@ -166,47 +166,47 @@ if(ZLIB_ADA_BUILD_STATIC)
 
     if(ZLIB_ADA_BUILD_TESTING)
         enable_testing()
-        ada_add_executable(ada-testStatic test.adb)
+        ada_add_executable(zlib_ada_testStatic test.adb)
 
-        target_link_libraries(ada-testStatic
+        target_link_libraries(zlib_ada_testStatic
             PRIVATE
-                zlib-AdaStatic
-                zlib-streamsStatic)
+                zlib_ada_AdaStatic
+                zlib_ada_streamsStatic)
 
-        ada_find_ali(ada-testStatic)
+        ada_find_ali(zlib_ada_testStatic)
 
-        add_test(NAME zlib_Ada_ada-testStatic COMMAND ada-testStatic)
-        set_tests_properties(zlib_Ada_ada-testStatic PROPERTIES FIXTURES_REQUIRED ada_cleanup)
+        add_test(NAME zlib_ada_testStatic COMMAND zlib_ada_testStatic)
+        set_tests_properties(zlib_ada_testStatic PROPERTIES FIXTURES_REQUIRED zlib_ada_cleanup)
 
-        ada_add_executable(buffer_demoStatic buffer_demo.adb)
+        ada_add_executable(zlib_ada_buffer-demoStatic buffer_demo.adb)
 
-        target_link_libraries(buffer_demoStatic
+        target_link_libraries(zlib_ada_buffer-demoStatic
             PRIVATE
-                zlib-AdaStatic)
+                zlib_ada_AdaStatic)
 
-        ada_find_ali(buffer_demoStatic)
+        ada_find_ali(zlib_ada_buffer-demoStatic)
 
-        add_test(NAME zlib_Ada-buffer-demoStatic COMMAND buffer_demoStatic)
+        add_test(NAME zlib_ada_buffer-demoStatic COMMAND zlib_ada_buffer-demoStatic)
 
-        ada_add_executable(mtestStatic mtest.adb)
+        ada_add_executable(zlib_ada_mtestStatic mtest.adb)
 
-        target_link_libraries(mtestStatic
+        target_link_libraries(zlib_ada_mtestStatic
             PRIVATE
-                zlib-AdaStatic)
+                zlib_ada_AdaStatic)
 
-        ada_find_ali(mtestStatic)
+        ada_find_ali(zlib_ada_mtestStatic)
 
         # Not adding test as this is an endless-loop
 
-        ada_add_executable(readStatic read.adb)
+        ada_add_executable(zlib_ada_readStatic read.adb)
 
-        target_link_libraries(readStatic
+        target_link_libraries(zlib_ada_readStatic
             PRIVATE
-                zlib-AdaStatic)
+                zlib_ada_AdaStatic)
 
-        ada_find_ali(readStatic)
+        ada_find_ali(zlib_ada_readStatic)
 
-        add_test(NAME zlib_Ada_readStatic COMMAND readStatic)
+        add_test(NAME zlib_ada_readStatic COMMAND zlib_ada_readStatic)
     endif(ZLIB_ADA_BUILD_TESTING)
 endif(ZLIB_ADA_BUILD_STATIC)
 
diff --git a/contrib/blast/CMakeLists.txt b/contrib/blast/CMakeLists.txt
index 092c5e2..a94b362 100644
--- a/contrib/blast/CMakeLists.txt
+++ b/contrib/blast/CMakeLists.txt
@@ -92,12 +92,13 @@ if(ZLIB_BLAST_BUILD_STATIC)
 
     if(ZLIB_BLAST_BUILD_TESTING)
         enable_testing()
-        add_executable(blast-testStatic blast-test.c)
-        target_link_libraries(blast-testStatic blastStatic)
+        add_executable(zlib_blast_testStatic blast-test.c)
+        target_link_libraries(zlib_blast_testStatic
+            PRIVATE zlib_blast_blastStatic)
 
-        add_test(NAME blast_testStatic
+        add_test(NAME zlib_blast_testStatic
             COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
-                    "$<TARGET_FILE:blast-testStatic>"
+                    "$<TARGET_FILE:zlib_blast_testStatic>"
                     "${CMAKE_CURRENT_SOURCE_DIR}"
                     "${CMAKE_CURRENT_BINARY_DIR}")
     endif(ZLIB_BLAST_BUILD_TESTING)
diff --git a/contrib/iostream3/CMakeLists.txt b/contrib/iostream3/CMakeLists.txt
index c0dbdca..9c47c1c 100644
--- a/contrib/iostream3/CMakeLists.txt
+++ b/contrib/iostream3/CMakeLists.txt
@@ -58,16 +58,16 @@ if(ZLIB_IOSTREAM3_BUILD_SHARED)
     if(ZLIB_IOSTREAM3_BUILD_TESTING)
         enable_testing()
 
-        add_executable(iostream-test test.cc)
+        add_executable(zlib_iostream3_test test.cc zfstream.h)
 
-        target_link_libraries(iostream-test
-            PRIVATE zlib-iostream3)
+        target_link_libraries(zlib_iostream3_test
+            PRIVATE zlib_iostream3_iostream3)
 
-        add_test(NAME zlib_iostream3_test COMMAND iostream-test)
+        add_test(NAME zlib_iostream3_test COMMAND zlib_iostream3_test)
 
         set_tests_properties(zlib_iostream3_test
             PROPERTIES
-                FIXTURES_REQUIRED iostream3_cleanup)
+                FIXTURES_REQUIRED zlib_iostream3_cleanup)
     endif(ZLIB_IOSTREAM3_BUILD_TESTING)
 endif(ZLIB_IOSTREAM3_BUILD_SHARED)
 
@@ -82,22 +82,24 @@ if(ZLIB_IOSTREAM3_BUILD_STATIC)
     target_link_libraries(zlib_iostream3_iostreamv3Static
         INTERFACE ZLIB::ZLIBSTATIC)
 
-    set_target_properties(zlib-iostream3Static
+    set_target_properties(zlib_iostream3_iostreamv3Static
         PROPERTIES
-            OUTPUT_NAME zlib-iostream3${zlib_IOStream3_static_suffix})
+            EXPORT_NAME IOSTREAMV3STATIC
+            OUTPUT_NAME iostream3${zlib_IOStream3_static_suffix})
 
     if(ZLIB_IOSTREAM3_BUILD_TESTING)
         enable_testing()
 
-        add_executable(iostream-testStatic test.cc)
+        add_executable(zlib_iostream3_testStatic test.cc zfstream.h)
 
-        target_link_libraries(iostream-testStatic
-            PRIVATE zlib-iostream3Static)
-        add_test(NAME zlib_iostream3_testStatic COMMAND iostream-testStatic)
+        target_link_libraries(zlib_iostream3_testStatic
+            PRIVATE zlib_iostream3_iostream3Static)
+        add_test(NAME zlib_iostream3_testStatic
+                 COMMAND zlib_iostream3_testStatic)
 
         set_tests_properties(zlib_iostream3_testStatic
             PROPERTIES
-                FIXTURES_REQUIRED iostream3_cleanup)
+                FIXTURES_REQUIRED zlib_iostream3_cleanup)
     endif(ZLIB_IOSTREAM3_BUILD_TESTING)
 endif(ZLIB_IOSTREAM3_BUILD_STATIC)
 
diff --git a/contrib/puff/CMakeLists.txt b/contrib/puff/CMakeLists.txt
index 866d3f7..ca95830 100644
--- a/contrib/puff/CMakeLists.txt
+++ b/contrib/puff/CMakeLists.txt
@@ -84,28 +84,28 @@ if(ZLIB_PUFF_BUILD_SHARED)
     if(ZLIB_PUFF_BUILD_TESTING)
         enable_testing()
 
-        add_executable(puff-test pufftest.c)
+        add_executable(zlib_puff_test pufftest.c puff.h)
 
-        target_link_libraries(puff-test
-            PRIVATE zlib-puff)
+        target_link_libraries(zlib_puff_test
+            PRIVATE zlib_puff_puff)
 
         add_test(NAME zlib_puff_test
             COMMAND ${CMAKE_COMMAND} -P
                     ${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
-                    "$<TARGET_FILE:puff-test>"
+                    "$<TARGET_FILE:zlib_puff_test>"
                     "${CMAKE_CURRENT_SOURCE_DIR}")
 
         if(GCOV_EXECUTABLE)
-            add_executable(puff-test-coverage pufftest.c puff.c)
+            add_executable(zlib_puff_test-coverage pufftest.c puff.c puff.h)
 
-            target_compile_options(puff-test-coverage PRIVATE -coverage)
+            target_compile_options(zlib_puff_test-coverage PRIVATE -coverage)
 
-            target_link_options(puff-test-coverage PRIVATE -coverage)
+            target_link_options(zlib_puff_test-coverage PRIVATE -coverage)
 
-            add_test(NAME zlib_puff_test_coverage
+            add_test(NAME zlib_puff_test-coverage
                 COMMAND ${CMAKE_COMMAND} -P
                         ${CMAKE_CURRENT_SOURCE_DIR}/tester-cov.cmake
-                        "$<TARGET_FILE:puff-test-coverage>"
+                        "$<TARGET_FILE:zlib_puff_test-coverage>"
                         "${CMAKE_CURRENT_SOURCE_DIR}"
                         "${CMAKE_CURRENT_BINARY_DIR}"
                         ${GCOV_EXECUTABLE}
@@ -129,27 +129,29 @@ if(ZLIB_PUFF_BUILD_STATIC)
     if(ZLIB_PUFF_BUILD_TESTING)
         enable_testing()
 
-        add_executable(puff-testStatic pufftest.c)
+        add_executable(zlib_puff_testStatic pufftest.c puff.h)
 
-        target_link_libraries(puff-testStatic
-            PRIVATE zlib-puffStatic)
+        target_link_libraries(zlib_puff_testStatic
+            PRIVATE zlib_puff_puffStatic)
         add_test(NAME zlib_puff_testStatic
             COMMAND ${CMAKE_COMMAND} -P
                     ${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
-                    "$<TARGET_FILE:puff-testStatic>"
+                    "$<TARGET_FILE:zlib_puff_testStatic>"
                     "${CMAKE_CURRENT_SOURCE_DIR}")
 
         if(GCOV_EXECUTABLE)
-            add_executable(puff-testStatic-coverage pufftest.c puff.c)
+            add_executable(zlib_puff_testStatic-coverage pufftest.c puff.c puff.h)
 
-            target_compile_options(puff-testStatic-coverage PRIVATE -coverage)
+            target_compile_options(zlib_puff_testStatic-coverage
+                PRIVATE -coverage)
 
-            target_link_options(puff-testStatic-coverage PRIVATE -coverage)
+            target_link_options(zlib_puff_testStatic-coverage
+                PRIVATE -coverage)
 
-            add_test(NAME zlib_puff_testStatic_coverage
+            add_test(NAME zlib_puff_testStatic-coverage
                 COMMAND ${CMAKE_COMMAND} -P
                     ${CMAKE_CURRENT_SOURCE_DIR}/tester-cov.cmake
-                    "$<TARGET_FILE:puff-testStatic-coverage>"
+                    "$<TARGET_FILE:zlib_puff_testStatic-coverage>"
                     "${CMAKE_CURRENT_SOURCE_DIR}"
                     "${CMAKE_CURRENT_BINARY_DIR}"
                     ${GCOV_EXECUTABLE}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fab91e4..098472e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -98,15 +98,15 @@ if(ZLIB_BUILD_STATIC)
         target_link_options(infcover PRIVATE -coverage)
         target_compile_definitions(
             infcover PRIVATE $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>)
-        add_test(NAME zlib-coverage COMMAND infcover)
+        add_test(NAME zlib_coverage COMMAND infcover)
         set(INFCOVER_DIR ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/infcover.dir)
         add_test(
-            NAME zlib-coverage-summary
+            NAME zlib_coverage-summary
             COMMAND
                 ${GCOV_EXECUTABLE} ${llvm_option}
                 ${CMAKE_CURRENT_SOURCE_DIR}/infcover.c -o
                 ${INFCOVER_DIR}/infcover.c.gcda)
-        set_tests_properties(zlib-coverage-summary PROPERTIES DEPENDS
+        set_tests_properties(zlib_coverage-summary PROPERTIES DEPENDS
                                                               zlib-coverage)
         set(CMAKE_C_FLAGS
             ${CFLAGS_OLD}