3 files changed, 50 insertions, 46 deletions

diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index c3e302a..cf5c1e0 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -7,16 +7,16 @@ option(ZLIB_WITH_GVMAT64
 option(ZLIB_WITH_INFBACK9 "Build with support for method 9 deflate" OFF)
 
 if(ZLIB_BUILD_ADA)
-    set(ZLIBADA_BUILD_SHARED ${ZLIB_BUILD_SHARED})
-    set(ZLIBADA_BUILD_STATIC ${ZLIB_BUILD_STATIC})
-    set(ZLIBADA_BUILD_TESTING ${ZLIB_BUILD_TESTING})
+    set(ZLIB_ADA_BUILD_SHARED ${ZLIB_BUILD_SHARED})
+    set(ZLIB_ADA_BUILD_STATIC ${ZLIB_BUILD_STATIC})
+    set(ZLIB_ADA_BUILD_TESTING ${ZLIB_BUILD_TESTING})
     add_subdirectory(ada/)
 endif(ZLIB_BUILD_ADA)
 
 if(ZLIB_BUILD_BLAST)
-    set(ZLIBBLAST_BUILD_SHARED ${ZLIB_BUILD_SHARED})
-    set(ZLIBBLAST_BUILD_STATIC ${ZLIB_BUILD_STATIC})
-    set(ZLIBBLAST_BUILD_TESTING ${ZLIB_BUILD_TESTING})
+    set(ZLIB_BLAST_BUILD_SHARED ${ZLIB_BUILD_SHARED})
+    set(ZLIB_BLAST_BUILD_STATIC ${ZLIB_BUILD_STATIC})
+    set(ZLIB_BLAST_BUILD_TESTING ${ZLIB_BUILD_TESTING})
     add_subdirectory(blast/)
 endif(ZLIB_BUILD_BLAST)
 
diff --git a/contrib/ada/CMakeLists.txt b/contrib/ada/CMakeLists.txt
index 98f7b97..cb8b156 100644
--- a/contrib/ada/CMakeLists.txt
+++ b/contrib/ada/CMakeLists.txt
@@ -9,9 +9,9 @@ project(
     DESCRIPTION "A library for creating zipfiles based in zlib"
     HOMEPAGE_URL "https://www.zlib.net")
 
-option(ZLIBADA_BUILD_SHARED "Enable building ada bindings shared library" ON)
-option(ZLIBADA_BUILD_STATIC "Enable building ada bindings static library" ON)
-option(ZLIBADA_BUILD_TESTING "Enable building tests for ada bindings library" ON)
+option(ZLIB_ADA_BUILD_SHARED "Enable building ada bindings shared library" ON)
+option(ZLIB_ADA_BUILD_STATIC "Enable building ada bindings static library" ON)
+option(ZLIB_ADA_BUILD_TESTING "Enable building tests for ada bindings library" ON)
 
 if(WIN32 OR CYGWIN)
     set(zlibAda_static_suffix "s")
@@ -19,18 +19,18 @@ if(WIN32 OR CYGWIN)
 endif(WIN32 OR CYGWIN)
 
 if(NOT DEFINED ZLIB_BUILD_ADA)
-    if(ZLIBADA_BUILD_SHARED)
+    if(ZLIB_ADA_BUILD_SHARED)
         list(APPEND REQUIRED_COMPONENTS "shared")
-    endif(ZLIBADA_BUILD_SHARED)
+    endif(ZLIB_ADA_BUILD_SHARED)
 
-    if(ZLIBADA_BUILD_STATIC)
+    if(ZLIB_ADA_BUILD_STATIC)
         list(APPEND REQUIRED_COMPONENTS "static")
-    endif(ZLIB_BUILD_STATIC)
+    endif(ZLIB_ADA_BUILD_STATIC)
 
     find_package(ZLIB REQUIRED COMPONENTS ${REQUIRED_COMPONENTS} CONFIG)
 endif(NOT DEFINED ZLIB_BUILD_ADA)
 
-function(ZLIBADA_findTestEnv testName)
+function(ZLIB_ADA_findTestEnv testName)
     set(testEnv "PATH=")
 
     if(MSVC OR MINGW)
@@ -43,9 +43,9 @@ function(ZLIBADA_findTestEnv testName)
     string(APPEND testEnv "$ENV{PATH}")
 
     set_tests_properties(${testName} PROPERTIES ENVIRONMENT "${testEnv}")
-endfunction(ZLIBADA_findTestEnv testName)
+endfunction(ZLIB_ADA_findTestEnv testName)
 
-if(ZLIBADA_BUILD_SHARED)
+if(ZLIB_ADA_BUILD_SHARED)
     ada_add_library(zlib-Ada SHARED
         zlib-thin.adb
         zlib.adb)
@@ -62,7 +62,7 @@ if(ZLIBADA_BUILD_SHARED)
 
     ada_find_ali(zlib-streams)
 
-    if(ZLIBADA_BUILD_TESTING)
+    if(ZLIB_ADA_BUILD_TESTING)
         enable_testing()
         ada_add_executable(ada-test test.adb)
 
@@ -73,14 +73,14 @@ if(ZLIBADA_BUILD_SHARED)
 
         ada_find_ali(ada-test)
 
-        add_test(NAME zlibAda_ada-test COMMAND ada-test)
-        set_tests_properties(zlibAda_ada-test PROPERTIES FIXTURES_REQUIRED ada_cleanup)
+        add_test(NAME zlib_Ada_ada-test COMMAND ada-test)
+        set_tests_properties(zlib_Ada_ada-test PROPERTIES FIXTURES_REQUIRED ada_cleanup)
 
         if(MSVC
            OR MSYS
            OR MINGW
            OR CYGWIN)
-            zlibada_findtestenv(zlibAda_ada-test)
+            zlib_ada_findtestenv(zlibAda_ada-test)
         endif(
             MSVC
             OR MSYS
@@ -95,13 +95,13 @@ if(ZLIBADA_BUILD_SHARED)
 
         ada_find_ali(buffer_demo)
 
-        add_test(NAME zlibAda_buffer-demo COMMAND buffer_demo)
+        add_test(NAME zlib_Ada_buffer-demo COMMAND buffer_demo)
 
         if(MSVC
            OR MSYS
            OR MINGW
            OR CYGWIN)
-            zlibada_findtestenv(zlibAda_buffer-demo)
+            zlib_ada_findtestenv(zlibAda_buffer-demo)
         endif(
             MSVC
             OR MSYS
@@ -126,22 +126,22 @@ if(ZLIBADA_BUILD_SHARED)
 
         ada_find_ali(read)
 
-        add_test(NAME zlibAda_read COMMAND read)
+        add_test(NAME zlib_Ada_read COMMAND read)
 
         if(MSVC
            OR MSYS
            OR MINGW
            OR CYGWIN)
-            zlibada_findtestenv(zlibAda_read)
+            zlib_ada_findtestenv(zlibAda_read)
         endif(
             MSVC
             OR MSYS
             OR MINGW
             OR CYGWIN)
-    endif(ZLIBADA_BUILD_TESTING)
-endif(ZLIBADA_BUILD_SHARED)
+    endif(ZLIB_ADA_BUILD_TESTING)
+endif(ZLIB_ADA_BUILD_SHARED)
 
-if(ZLIBADA_BUILD_STATIC)
+if(ZLIB_ADA_BUILD_STATIC)
     ada_add_library(zlib-AdaStatic STATIC
         zlib-thin.adb
         zlib.adb)
@@ -161,7 +161,7 @@ if(ZLIBADA_BUILD_STATIC)
 
     ada_find_ali(zlib-streamsStatic)
 
-    if(ZLIBADA_BUILD_TESTING)
+    if(ZLIB_ADA_BUILD_TESTING)
         enable_testing()
         ada_add_executable(ada-testStatic test.adb)
 
@@ -172,8 +172,8 @@ if(ZLIBADA_BUILD_STATIC)
 
         ada_find_ali(ada-testStatic)
 
-        add_test(NAME zlibAda_ada-testStatic COMMAND ada-testStatic)
-        set_tests_properties(zlibAda_ada-testStatic PROPERTIES FIXTURES_REQUIRED ada_cleanup)
+        add_test(NAME zlib_Ada_ada-testStatic COMMAND ada-testStatic)
+        set_tests_properties(zlib_Ada_ada-testStatic PROPERTIES FIXTURES_REQUIRED ada_cleanup)
 
         ada_add_executable(buffer_demoStatic buffer_demo.adb)
 
@@ -183,7 +183,7 @@ if(ZLIBADA_BUILD_STATIC)
 
         ada_find_ali(buffer_demoStatic)
 
-        add_test(NAME zlibAda-buffer-demoStatic COMMAND buffer_demoStatic)
+        add_test(NAME zlib_Ada-buffer-demoStatic COMMAND buffer_demoStatic)
 
         ada_add_executable(mtestStatic mtest.adb)
 
@@ -203,12 +203,12 @@ if(ZLIBADA_BUILD_STATIC)
 
         ada_find_ali(readStatic)
 
-        add_test(NAME zlibAda_readStatic COMMAND readStatic)
-    endif(ZLIBADA_BUILD_TESTING)
-endif(ZLIBADA_BUILD_STATIC)
+        add_test(NAME zlib_Ada_readStatic COMMAND readStatic)
+    endif(ZLIB_ADA_BUILD_TESTING)
+endif(ZLIB_ADA_BUILD_STATIC)
 
-if(ZLIBADA_BUILD_TESTING)
-    add_test(NAME zlibAda_cleanup COMMAND ${CMAKE_COMMAND} -E rm ${CMAKE_CURRENT_BINARY_DIR}/testzlib.in
+if(ZLIB_ADA_BUILD_TESTING)
+    add_test(NAME zlib_Ada_cleanup COMMAND ${CMAKE_COMMAND} -E rm ${CMAKE_CURRENT_BINARY_DIR}/testzlib.in
         ${CMAKE_CURRENT_BINARY_DIR}/testzlib.out ${CMAKE_CURRENT_BINARY_DIR}/testzlib.zlb)
-    set_tests_properties(zlibAda_cleanup PROPERTIES FIXTURES_CLEANUP ada_cleanup)
-endif(ZLIBADA_BUILD_TESTING)
+    set_tests_properties(zlib_Ada_cleanup PROPERTIES FIXTURES_CLEANUP ada_cleanup)
+endif(ZLIB_ADA_BUILD_TESTING)
diff --git a/contrib/blast/CMakeLists.txt b/contrib/blast/CMakeLists.txt
index 6357fcb..12c08a6 100644
--- a/contrib/blast/CMakeLists.txt
+++ b/contrib/blast/CMakeLists.txt
@@ -9,6 +9,10 @@ project(
     DESCRIPTION "A library for creating zipfiles based in zlib"
     HOMEPAGE_URL "https://www.zlib.net")
 
+option(ZLIB_BLAST_BUILD_SHARED "Enable building blast shared library" ON)
+option(ZLIB_BLAST_BUILD_STATIC "Enable building blast static library" ON)
+option(ZLIB_BLAST_BUILD_TESTING "Enable building tests for blast" ON)
+
 if(WIN32 OR CYGWIN)
     set(zlibAda_static_suffix "s")
     set(CMAKE_DEBUG_POSTFIX "d")
@@ -29,12 +33,12 @@ function(blast_findTestEnv testName)
     set_tests_properties(${testName} PROPERTIES ENVIRONMENT "${testEnv}")
 endfunction(blast_findTestEnv testName)
 
-if(ZLIBBLAST_BUILD_SHARED)
+if(ZLIB_BLAST_BUILD_SHARED)
     add_library(blast SHARED
                 blast.c
                 blast.h)
 
-    if(ZLIBBLAST_BUILD_TESTING)
+    if(ZLIB_BLAST_BUILD_TESTING)
         enable_testing()
         add_executable(blast-test blast-test.c)
         target_link_libraries(blast-test blast)
@@ -55,10 +59,10 @@ if(ZLIBBLAST_BUILD_SHARED)
             OR MSYS
             OR MINGW
             OR CYGWIN)
-    endif(ZLIBBLAST_BUILD_TESTING)
-endif(ZLIBBLAST_BUILD_SHARED)
+    endif(ZLIB_BLAST_BUILD_TESTING)
+endif(ZLIB_BLAST_BUILD_SHARED)
 
-if(ZLIBBLAST_BUILD_STATIC)
+if(ZLIB_BLAST_BUILD_STATIC)
     add_library(blastStatic STATIC
                 blast.c
                 blast.h)
@@ -67,7 +71,7 @@ if(ZLIBBLAST_BUILD_STATIC)
         PROPERTIES
             OUTPUT_NAME blast${minizip_static_suffix})
 
-    if(ZLIBBLAST_BUILD_TESTING)
+    if(ZLIB_BLAST_BUILD_TESTING)
         enable_testing()
         add_executable(blast-testStatic blast-test.c)
         target_link_libraries(blast-testStatic blastStatic)
@@ -77,5 +81,5 @@ if(ZLIBBLAST_BUILD_STATIC)
                     "$<TARGET_FILE:blast-testStatic>"
                     "${CMAKE_CURRENT_SOURCE_DIR}"
                     "${CMAKE_CURRENT_BINARY_DIR}")
-    endif(ZLIBBLAST_BUILD_TESTING)
-endif(ZLIBBLAST_BUILD_STATIC)
+    endif(ZLIB_BLAST_BUILD_TESTING)
+endif(ZLIB_BLAST_BUILD_STATIC)