Commit 90d5bd8 for zlib
commit 90d5bd8a134ed0021f0061421c9cd29f9bdc4b60
Author: Vollstrecker <werner@vollstreckernet.de>
Date: Fri Feb 27 19:36:42 2026 +0100
CMake: Prefix targets and tests with zlib_ when not standalone.
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 5c49800..19e3a56 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -39,6 +39,7 @@ function(zlib_add_contrib_feature name description dir)
endfunction(zlib_add_contrib_feature name description dir)
set(WORK_DIR ${zlib_BINARY_DIR}/test)
+set(ZLIB_CONTRIB_PREFIX "zlib_")
set(inst_setup zlib_install)
zlib_add_contrib_feature("GVMAT64"
diff --git a/contrib/blast/CMakeLists.txt b/contrib/blast/CMakeLists.txt
index f3379a7..d22c919 100644
--- a/contrib/blast/CMakeLists.txt
+++ b/contrib/blast/CMakeLists.txt
@@ -23,7 +23,7 @@ include(GNUInstallDirs)
include(CMakePackageConfigHelpers)
if(WIN32 OR CYGWIN)
- set(zlibblast_static_suffix "s")
+ set(${ZLIB_CONTRIB_PREFIX}blast_static_suffix "s")
set(CMAKE_DEBUG_POSTFIX "d")
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
endif(WIN32 OR CYGWIN)
@@ -44,32 +44,34 @@ function(blast_findTestEnv testName)
endfunction(blast_findTestEnv testName)
if(ZLIB_BLAST_BUILD_SHARED)
- add_library(zlib_blast_blast SHARED
+ add_library(${ZLIB_CONTRIB_PREFIX}blast_blast SHARED
blast.c
blast.h)
- add_library(BLAST::BLAST ALIAS zlib_blast_blast)
+ add_library(BLAST::BLAST ALIAS ${ZLIB_CONTRIB_PREFIX}blast_blast)
if(NOT CYGWIN)
- set_target_properties(zlib_blast_blast
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}blast_blast
PROPERTIES
SOVERSION ${blast_VERSION_MAJOR}
VERSION ${blast_VERSION})
endif(NOT CYGWIN)
- set_target_properties(zlib_blast_blast
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}blast_blast
PROPERTIES
EXPORT_NAME BLAST
OUTPUT_NAME blast)
if(ZLIB_BLAST_BUILD_TESTING)
enable_testing()
- add_executable(zlib_blast_test blast-test.c)
- target_link_libraries(zlib_blast_test PRIVATE zlib_blast_blast)
+ add_executable(${ZLIB_CONTRIB_PREFIX}blast_test blast-test.c)
+ target_link_libraries(${ZLIB_CONTRIB_PREFIX}blast_test
+ PRIVATE
+ ${ZLIB_CONTRIB_PREFIX}blast_blast)
- add_test(NAME zlib_blast_blast-test
+ add_test(NAME ${ZLIB_CONTRIB_PREFIX}blast_blast-test
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
- "$<TARGET_FILE:zlib_blast_test>"
+ "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}blast_test>"
"${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}")
@@ -77,7 +79,7 @@ if(ZLIB_BLAST_BUILD_SHARED)
OR MSYS
OR MINGW
OR CYGWIN)
- blast_findtestenv(zlib_blast_blast-test)
+ blast_findtestenv(${ZLIB_CONTRIB_PREFIX}blast_blast-test)
endif(
MSVC
OR MSYS
@@ -87,26 +89,26 @@ if(ZLIB_BLAST_BUILD_SHARED)
endif(ZLIB_BLAST_BUILD_SHARED)
if(ZLIB_BLAST_BUILD_STATIC)
- add_library(zlib_blast_blastStatic STATIC
+ add_library(${ZLIB_CONTRIB_PREFIX}blast_blastStatic STATIC
blast.c
blast.h)
- add_library(BLAST::BLASTSTATIC ALIAS zlib_blast_blastStatic)
+ add_library(BLAST::BLASTSTATIC ALIAS ${ZLIB_CONTRIB_PREFIX}blast_blastStatic)
- set_target_properties(zlib_blast_blastStatic
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}blast_blastStatic
PROPERTIES
EXPORT_NAME BLASTSTATIC
- OUTPUT_NAME blast${zlibblast_static_suffix})
+ OUTPUT_NAME blast${${ZLIB_CONTRIB_PREFIX}blast_static_suffix})
if(ZLIB_BLAST_BUILD_TESTING)
enable_testing()
- add_executable(zlib_blast_testStatic blast-test.c)
- target_link_libraries(zlib_blast_testStatic
- PRIVATE zlib_blast_blastStatic)
+ add_executable(${ZLIB_CONTRIB_PREFIX}blast_testStatic blast-test.c)
+ target_link_libraries(${ZLIB_CONTRIB_PREFIX}blast_testStatic
+ PRIVATE ${ZLIB_CONTRIB_PREFIX}blast_blastStatic)
- add_test(NAME zlib_blast_testStatic
+ add_test(NAME ${ZLIB_CONTRIB_PREFIX}blast_testStatic
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
- "$<TARGET_FILE:zlib_blast_testStatic>"
+ "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}blast_testStatic>"
"${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}")
endif(ZLIB_BLAST_BUILD_TESTING)
@@ -119,20 +121,20 @@ endif(ZLIB_BLAST_BUILD_TESTING)
if(ZLIB_BLAST_INSTALL)
if(ZLIB_BLAST_BUILD_SHARED)
install(
- TARGETS zlib_blast_blast
+ TARGETS ${ZLIB_CONTRIB_PREFIX}blast_blast
COMPONENT Runtime
- EXPORT zlibBlastSharedExport
+ EXPORT blastSharedExport
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
install(
- EXPORT zlibBlastSharedExport
+ EXPORT blastSharedExport
FILE blast-shared.cmake
NAMESPACE BLAST::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/blast)
if(MSVC)
install(
- FILES $<TARGET_PDB_FILE:zlib_blast_blast>
+ FILES $<TARGET_PDB_FILE:${ZLIB_CONTRIB_PREFIX}blast_blast>
COMPONENT Development
DESTINATION ${CMAKE_INSTALL_BINDIR}
CONFIGURATIONS Debug OR RelWithDebInfo
@@ -142,12 +144,12 @@ if(ZLIB_BLAST_INSTALL)
if(ZLIB_BLAST_BUILD_STATIC)
install(
- TARGETS zlib_blast_blastStatic
+ TARGETS ${ZLIB_CONTRIB_PREFIX}blast_blastStatic
COMPONENT Development
- EXPORT zlibBlastStaticExport
+ EXPORT blastStaticExport
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
install(
- EXPORT zlibBlastStaticExport
+ EXPORT blastStaticExport
FILE blast-static.cmake
NAMESPACE BLAST::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/blast)
diff --git a/contrib/blast/test/CMakeLists.txt b/contrib/blast/test/CMakeLists.txt
index c4eac55..cdcd83e 100644
--- a/contrib/blast/test/CMakeLists.txt
+++ b/contrib/blast/test/CMakeLists.txt
@@ -1,20 +1,20 @@
# if we are built from with zlib, use this path's)
if(NOT DEFINED ZLIB_BUILD_BLAST)
set(WORK_DIR ${CMAKE_CURRENT_BINARY_DIR})
- set(inst_setup zlib_blast_install)
+ set(inst_setup blast_install)
set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}")
add_test(
- NAME zlib_blast_install
+ NAME blast_install
COMMAND ${CMAKE_COMMAND}
--install ${blast_BINARY_DIR}
--prefix ${WORK_DIR}/test_install
--config $<CONFIG>
WORKING_DIRECTORY ${WORK_DIR})
- set_tests_properties(zlib_blast_install
+ set_tests_properties(blast_install
PROPERTIES
- FIXTURES_SETUP zlib_blast_install)
+ FIXTURES_SETUP blast_install)
endif(NOT DEFINED ZLIB_BUILD_BLAST)
configure_file(
@@ -51,7 +51,7 @@ endif(GENERATOR)
# find_package_test
#
add_test(
- NAME zlib_blast_find_package_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}blast_find_package_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -66,16 +66,16 @@ add_test(
-S${WORK_DIR}/blast_find_package_test)
add_test(
- NAME zlib_blast_find_package_build
+ NAME ${ZLIB_CONTRIB_PREFIX}blast_find_package_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY ${WORK_DIR}/blast_find_package_test_build)
-set_tests_properties(zlib_blast_find_package_configure
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_find_package_configure
PROPERTIES
FIXTURES_REQUIRED ${inst_setup}
FIXTURES_SETUP blast_fp_config)
-set_tests_properties(zlib_blast_find_package_build
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_find_package_build
PROPERTIES
FIXTURES_REQUIRED blast_fp_config)
@@ -83,7 +83,7 @@ set_tests_properties(zlib_blast_find_package_build
# add_subdirectory_test
#
add_test(
- NAME zlib_blast_add_subdirectory_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}blast_add_subdirectory_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -98,16 +98,16 @@ add_test(
-S${WORK_DIR}/blast_add_subdirectory_test)
add_test(
- NAME zlib_blast_add_subdirectory_build
+ NAME ${ZLIB_CONTRIB_PREFIX}blast_add_subdirectory_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY ${WORK_DIR}/blast_add_subdirectory_test_build)
-set_tests_properties(zlib_blast_add_subdirectory_configure
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_add_subdirectory_configure
PROPERTIES
FIXTURES_REQUIRED ${inst_setup}
FIXTURES_SETUP blast_as_config)
-set_tests_properties(zlib_blast_add_subdirectory_build
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_add_subdirectory_build
PROPERTIES
FIXTURES_REQUIRED blast_as_config)
@@ -115,7 +115,7 @@ set_tests_properties(zlib_blast_add_subdirectory_build
# add_subdirectory_exclude_test
#
add_test(
- NAME zlib_blast_add_subdirectory_exclude_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}blast_add_subdirectory_exclude_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -130,17 +130,18 @@ add_test(
-S${WORK_DIR}/blast_add_subdirectory_exclude_test)
add_test(
- NAME zlib_blast_add_subdirectory_exclude_build
+ NAME ${ZLIB_CONTRIB_PREFIX}blast_add_subdirectory_exclude_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY
${WORK_DIR}/blast_add_subdirectory_exclude_test_build)
-set_tests_properties(zlib_blast_add_subdirectory_exclude_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- FIXTURES_SETUP blast_asx_config)
+set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}blast_add_subdirectory_exclude_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup}
+ FIXTURES_SETUP blast_asx_config)
-set_tests_properties(zlib_blast_add_subdirectory_exclude_build
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_add_subdirectory_exclude_build
PROPERTIES
FIXTURES_REQUIRED blast_asx_config)
@@ -148,7 +149,7 @@ set_tests_properties(zlib_blast_add_subdirectory_exclude_build
# findpackage_no_components_test
#
add_test(
- NAME zlib_blast_find_package_no_components_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}blast_find_package_no_components_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -162,21 +163,23 @@ add_test(
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/blast_find_package_no_components_test)
-set_tests_properties(zlib_blast_find_package_no_components_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup})
+set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}blast_find_package_no_components_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup})
if(NOT ZLIB_BLAST_BUILD_SHARED OR NOT ZLIB_BLAST_BUILD_STATIC)
- set_tests_properties(zlib_blast_find_package_no_components_configure
- PROPERTIES
- WILL_FAIL TRUE)
+ set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}blast_find_package_no_components_configure
+ PROPERTIES
+ WILL_FAIL TRUE)
endif(NOT ZLIB_BLAST_BUILD_SHARED OR NOT ZLIB_BLAST_BUILD_STATIC)
#
# find_package_wrong_components_test
#
add_test(
- NAME zlib_blast_find_package_wrong_components_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}blast_find_package_wrong_components_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -190,7 +193,7 @@ add_test(
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/blast_find_package_wrong_components_test)
-set_tests_properties(zlib_blast_find_package_wrong_components_configure
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_find_package_wrong_components_configure
PROPERTIES
FIXTURES_REQUIRED ${inst_setup}
WILL_FAIL TRUE)
diff --git a/contrib/iostream3/CMakeLists.txt b/contrib/iostream3/CMakeLists.txt
index 727e36b..092a2f2 100644
--- a/contrib/iostream3/CMakeLists.txt
+++ b/contrib/iostream3/CMakeLists.txt
@@ -35,7 +35,7 @@ if(NOT DEFINED ZLIB_BUILD_IOSTREAM3)
endif(NOT DEFINED ZLIB_BUILD_IOSTREAM3)
if(WIN32 OR CYGWIN)
- set(zlib_IOStream3_static_suffix "s")
+ set(${ZLIB_CONTRIB_PREFIX}IOStream3_static_suffix "s")
set(CMAKE_DEBUG_POSTFIX "d")
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
endif(WIN32 OR CYGWIN)
@@ -50,7 +50,8 @@ function(iostreamv3_findTestEnv testName)
set(separator ":")
endif()
- string(APPEND testEnv "$<TARGET_FILE_DIR:zlib_iostream3_iostreamv3>${separator}")
+ string(APPEND testEnv
+ "$<TARGET_FILE_DIR:${ZLIB_CONTRIB_PREFIX}iostream3_iostreamv3>${separator}")
string(APPEND testEnv "$<TARGET_FILE_DIR:ZLIB::ZLIB>${separator}")
string(APPEND testEnv "$ENV{PATH}")
@@ -58,46 +59,48 @@ function(iostreamv3_findTestEnv testName)
endfunction(iostreamv3_findTestEnv testName)
if(ZLIB_IOSTREAM3_BUILD_SHARED)
- add_library(zlib_iostream3_iostreamv3 SHARED
+ add_library(${ZLIB_CONTRIB_PREFIX}iostream3_iostreamv3 SHARED
zfstream.cc
zfstream.h)
- add_library(IOSTREAMV3::IOSTREAMV3 ALIAS zlib_iostream3_iostreamv3)
+ add_library(IOSTREAMV3::IOSTREAMV3 ALIAS
+ ${ZLIB_CONTRIB_PREFIX}iostream3_iostreamv3)
if(NOT CYGWIN)
- set_target_properties(zlib_iostream3_iostreamv3
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}iostream3_iostreamv3
PROPERTIES
SOVERSION ${iostreamV3_VERSION_MAJOR}
VERSION ${iostreamV3_VERSION})
endif(NOT CYGWIN)
- set_target_properties(zlib_iostream3_iostreamv3
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}iostream3_iostreamv3
PROPERTIES
EXPORT_NAME IOSTREAMV3
OUTPUT_NAME iostream3)
- target_link_libraries(zlib_iostream3_iostreamv3
+ target_link_libraries(${ZLIB_CONTRIB_PREFIX}iostream3_iostreamv3
PUBLIC ZLIB::ZLIB)
if(ZLIB_IOSTREAM3_BUILD_TESTING)
enable_testing()
- add_executable(zlib_iostream3_test test.cc zfstream.h)
+ add_executable(${ZLIB_CONTRIB_PREFIX}iostream3_test test.cc zfstream.h)
- target_link_libraries(zlib_iostream3_test
+ target_link_libraries(${ZLIB_CONTRIB_PREFIX}iostream3_test
PRIVATE IOSTREAMV3::IOSTREAMV3)
- add_test(NAME zlib_iostream3_test COMMAND zlib_iostream3_test)
+ add_test(NAME ${ZLIB_CONTRIB_PREFIX}iostream3_test
+ COMMAND ${ZLIB_CONTRIB_PREFIX}iostream3_test)
- set_tests_properties(zlib_iostream3_test
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}iostream3_test
PROPERTIES
- FIXTURES_REQUIRED zlib_iostream3_cleanup)
+ FIXTURES_REQUIRED ${ZLIB_CONTRIB_PREFIX}iostream3_cleanup)
if(MSVC
OR MSYS
OR MINGW
OR CYGWIN)
- iostreamv3_findtestenv(zlib_iostream3_test)
+ iostreamv3_findtestenv(${ZLIB_CONTRIB_PREFIX}iostream3_test)
endif(
MSVC
OR MSYS
@@ -107,46 +110,52 @@ if(ZLIB_IOSTREAM3_BUILD_SHARED)
endif(ZLIB_IOSTREAM3_BUILD_SHARED)
if(ZLIB_IOSTREAM3_BUILD_STATIC)
- add_library(zlib_iostream3_iostreamv3Static STATIC
+ add_library(${ZLIB_CONTRIB_PREFIX}iostream3_iostreamv3Static STATIC
zfstream.cc
zfstream.h)
add_library(IOSTREAMV3::IOSTREAMV3STATIC
- ALIAS zlib_iostream3_iostreamv3Static)
+ ALIAS ${ZLIB_CONTRIB_PREFIX}iostream3_iostreamv3Static)
- target_link_libraries(zlib_iostream3_iostreamv3Static
+ target_link_libraries(${ZLIB_CONTRIB_PREFIX}iostream3_iostreamv3Static
PUBLIC ZLIB::ZLIBSTATIC)
- set_target_properties(zlib_iostream3_iostreamv3Static
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}iostream3_iostreamv3Static
PROPERTIES
EXPORT_NAME IOSTREAMV3STATIC
- OUTPUT_NAME iostream3${zlib_IOStream3_static_suffix})
+ OUTPUT_NAME
+ iostream3${${ZLIB_CONTRIB_PREFIX}IOStream3_static_suffix})
if(ZLIB_IOSTREAM3_BUILD_TESTING)
enable_testing()
- add_executable(zlib_iostream3_testStatic test.cc zfstream.h)
+ add_executable(${ZLIB_CONTRIB_PREFIX}iostream3_testStatic
+ test.cc
+ zfstream.h)
- target_link_libraries(zlib_iostream3_testStatic
+ target_link_libraries(${ZLIB_CONTRIB_PREFIX}iostream3_testStatic
PRIVATE IOSTREAMV3::IOSTREAMV3STATIC)
- add_test(NAME zlib_iostream3_testStatic
- COMMAND zlib_iostream3_testStatic)
+ add_test(NAME ${ZLIB_CONTRIB_PREFIX}iostream3_testStatic
+ COMMAND ${ZLIB_CONTRIB_PREFIX}iostream3_testStatic)
- set_tests_properties(zlib_iostream3_testStatic
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}iostream3_testStatic
PROPERTIES
- FIXTURES_REQUIRED zlib_iostream3_cleanup)
+ FIXTURES_REQUIRED ${ZLIB_CONTRIB_PREFIX}iostream3_cleanup)
endif(ZLIB_IOSTREAM3_BUILD_TESTING)
endif(ZLIB_IOSTREAM3_BUILD_STATIC)
if(ZLIB_IOSTREAM3_BUILD_TESTING)
- add_test(NAME zlib_iostream3_cleanup COMMAND ${CMAKE_COMMAND} -E rm
- ${CMAKE_CURRENT_BINARY_DIR}/test1.txt.gz
- ${CMAKE_CURRENT_BINARY_DIR}/test2.txt.gz)
-
- set_tests_properties(zlib_iostream3_cleanup
+ add_test(NAME ${ZLIB_CONTRIB_PREFIX}iostream3_cleanup
+ COMMAND ${CMAKE_COMMAND}
+ -E
+ rm
+ ${CMAKE_CURRENT_BINARY_DIR}/test1.txt.gz
+ ${CMAKE_CURRENT_BINARY_DIR}/test2.txt.gz)
+
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}iostream3_cleanup
PROPERTIES
- FIXTURES_CLEANUP zlib_iostream3_cleanup)
+ FIXTURES_CLEANUP ${ZLIB_CONTRIB_PREFIX}iostream3_cleanup)
add_subdirectory(test)
endif(ZLIB_IOSTREAM3_BUILD_TESTING)
@@ -154,20 +163,21 @@ endif(ZLIB_IOSTREAM3_BUILD_TESTING)
if(ZLIB_IOSTREAM3_INSTALL)
if(ZLIB_IOSTREAM3_BUILD_SHARED)
install(
- TARGETS zlib_iostream3_iostreamv3
+ TARGETS ${ZLIB_CONTRIB_PREFIX}iostream3_iostreamv3
COMPONENT Runtime
- EXPORT zlibiostream3SharedExport
+ EXPORT iostream3SharedExport
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
install(
- EXPORT zlibiostream3SharedExport
+ EXPORT iostream3SharedExport
FILE iostreamv3-shared.cmake
NAMESPACE IOSTREAMV3::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/iostreamv3)
if(MSVC)
install(
- FILES $<TARGET_PDB_FILE:zlib_iostream3_iostreamv3>
+ FILES
+ $<TARGET_PDB_FILE:${ZLIB_CONTRIB_PREFIX}iostream3_iostreamv3>
COMPONENT Development
DESTINATION ${CMAKE_INSTALL_BINDIR}
CONFIGURATIONS Debug OR RelWithDebInfo
@@ -177,7 +187,7 @@ if(ZLIB_IOSTREAM3_INSTALL)
if(ZLIB_IOSTREAM3_BUILD_STATIC)
install(
- TARGETS zlib_iostream3_iostreamv3Static
+ TARGETS ${ZLIB_CONTRIB_PREFIX}iostream3_iostreamv3Static
COMPONENT Development
EXPORT iostream3StaticExport
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
diff --git a/contrib/iostream3/test/CMakeLists.txt b/contrib/iostream3/test/CMakeLists.txt
index c89713d..e5b38fe 100644
--- a/contrib/iostream3/test/CMakeLists.txt
+++ b/contrib/iostream3/test/CMakeLists.txt
@@ -1,20 +1,20 @@
# if we are built from with zlib, use this path's)
if(NOT DEFINED ZLIB_BUILD_IOSTREAM3)
set(WORK_DIR ${CMAKE_CURRENT_BINARY_DIR})
- set(inst_setup zlib_iostream3_install)
+ set(inst_setup ${ZLIB_CONTRIB_PREFIX}iostream3_install)
set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}")
add_test(
- NAME zlib_iostream3_install
+ NAME ${ZLIB_CONTRIB_PREFIX}iostream3_install
COMMAND ${CMAKE_COMMAND}
--install ${iostreamV3_BINARY_DIR}
--prefix ${WORK_DIR}/test_install
--config $<CONFIG>
WORKING_DIRECTORY ${WORK_DIR})
- set_tests_properties(zlib_iostream3_install
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}iostream3_install
PROPERTIES
- FIXTURES_SETUP zlib_iostream3_install)
+ FIXTURES_SETUP ${ZLIB_CONTRIB_PREFIX}iostream3_install)
endif(NOT DEFINED ZLIB_BUILD_IOSTREAM3)
configure_file(
@@ -51,7 +51,7 @@ endif(GENERATOR)
# findpackage_test
#
add_test(
- NAME zlib_iostream3_find_package_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}iostream3_find_package_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -66,16 +66,16 @@ add_test(
-S${WORK_DIR}/iostream3_find_package_test)
add_test(
- NAME zlib_iostream3_find_package_build
+ NAME ${ZLIB_CONTRIB_PREFIX}iostream3_find_package_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY ${WORK_DIR}/iostream3_find_package_test_build)
-set_tests_properties(zlib_iostream3_find_package_configure
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}iostream3_find_package_configure
PROPERTIES
FIXTURES_REQUIRED ${inst_setup}
FIXTURES_SETUP iostream3_fp_config)
-set_tests_properties(zlib_iostream3_find_package_build
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}iostream3_find_package_build
PROPERTIES
FIXTURES_REQUIRED iostream3_fp_config)
@@ -83,7 +83,7 @@ set_tests_properties(zlib_iostream3_find_package_build
# add_subdirectory_test
#
add_test(
- NAME zlib_iostream3_add_subdirectory_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}iostream3_add_subdirectory_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -98,16 +98,16 @@ add_test(
-S${WORK_DIR}/iostream3_add_subdirectory_test)
add_test(
- NAME zlib_iostream3_add_subdirectory_build
+ NAME ${ZLIB_CONTRIB_PREFIX}iostream3_add_subdirectory_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY ${WORK_DIR}/iostream3_add_subdirectory_test_build)
-set_tests_properties(zlib_iostream3_add_subdirectory_configure
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}iostream3_add_subdirectory_configure
PROPERTIES
FIXTURES_REQUIRED ${inst_setup}
FIXTURES_SETUP iostream3as_config)
-set_tests_properties(zlib_iostream3_add_subdirectory_build
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}iostream3_add_subdirectory_build
PROPERTIES
FIXTURES_REQUIRED iostream3_as_config)
@@ -115,7 +115,7 @@ set_tests_properties(zlib_iostream3_add_subdirectory_build
# add_subdirectory_exclude_test
#
add_test(
- NAME zlib_iostream3_add_subdirectory_exclude_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}iostream3_add_subdirectory_exclude_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -130,25 +130,27 @@ add_test(
-S${WORK_DIR}/iostream3_add_subdirectory_exclude_test)
add_test(
- NAME zlib_iostream3_add_subdirectory_exclude_build
+ NAME ${ZLIB_CONTRIB_PREFIX}iostream3_add_subdirectory_exclude_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY
${WORK_DIR}/iostream3_add_subdirectory_exclude_test_build)
-set_tests_properties(zlib_iostream3_add_subdirectory_exclude_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- FIXTURES_SETUP iostream3_asx_config)
+set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}iostream3_add_subdirectory_exclude_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup}
+ FIXTURES_SETUP iostream3_asx_config)
-set_tests_properties(zlib_iostream3_add_subdirectory_exclude_build
- PROPERTIES
- FIXTURES_REQUIRED iostream3_asx_config)
+set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}iostream3_add_subdirectory_exclude_build
+ PROPERTIES
+ FIXTURES_REQUIRED iostream3_asx_config)
#
# find_package_no_components_test
#
add_test(
- NAME zlib_iostream3_find_package_no_components_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}iostream3_find_package_no_components_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -162,21 +164,24 @@ add_test(
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/iostream3_find_package_no_components_test)
-set_tests_properties(zlib_iostream3_find_package_no_components_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup})
+set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}iostream3_find_package_no_components_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup})
if(NOT ZLIB_IOSTREAM3_BUILD_SHARED OR NOT ZLIB_IOSTREAM3_BUILD_STATIC)
- set_tests_properties(zlib_iostream3_find_package_no_components_configure
- PROPERTIES
- WILL_FAIL TRUE)
+ set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}iostream3_find_package_no_components_configure
+ PROPERTIES
+ WILL_FAIL TRUE)
endif(NOT ZLIB_IOSTREAM3_BUILD_SHARED OR NOT ZLIB_IOSTREAM3_BUILD_STATIC)
#
# find_package_no_components_test
#
add_test(
- NAME zlib_iostream3_find_package_wrong_components_configure
+ NAME
+ ${ZLIB_CONTRIB_PREFIX}iostream3_find_package_wrong_components_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -190,7 +195,8 @@ add_test(
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/iostream3_find_package_wrong_components_test)
-set_tests_properties(zlib_iostream3_find_package_wrong_components_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- WILL_FAIL TRUE)
+set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}iostream3_find_package_wrong_components_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup}
+ WILL_FAIL TRUE)
diff --git a/contrib/minizip/CMakeLists.txt b/contrib/minizip/CMakeLists.txt
index 0592855..ce5f4ef 100644
--- a/contrib/minizip/CMakeLists.txt
+++ b/contrib/minizip/CMakeLists.txt
@@ -130,110 +130,160 @@ if(WIN32 OR CYGWIN)
endif(WIN32 OR CYGWIN)
if(MINIZIP_BUILD_SHARED)
- add_library(libminizip SHARED ${LIBMINIZIP_SRCS} ${LIBMINIZIP_HDRS})
- add_library(MINIZIP::minizip ALIAS libminizip)
- target_include_directories(
- libminizip PUBLIC $<BUILD_INTERFACE:${minizip_SOURCE_DIR}>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
- target_compile_definitions(
- libminizip
- PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
- $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>
- $<$<BOOL:${HAVE_UNISTD_H}>:HAVE_UNISTD_H=1>
- PUBLIC $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>
- $<$<BOOL:${BZIP2_FOUND}>:HAVE_BZIP2=1>
- $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
+ add_library(${ZLIB_CONTRIB_PREFIX}libminizip SHARED
+ ${LIBMINIZIP_SRCS}
+ ${LIBMINIZIP_HDRS})
+ add_library(MINIZIP::minizip ALIAS ${ZLIB_CONTRIB_PREFIX}libminizip)
+ target_include_directories(${ZLIB_CONTRIB_PREFIX}libminizip
+ PUBLIC
+ $<BUILD_INTERFACE:${minizip_SOURCE_DIR}>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+ target_compile_definitions(${ZLIB_CONTRIB_PREFIX}libminizip
+ PRIVATE
+ $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
+ $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>
+ $<$<BOOL:${HAVE_UNISTD_H}>:HAVE_UNISTD_H=1>
+ PUBLIC
+ $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>
+ $<$<BOOL:${BZIP2_FOUND}>:HAVE_BZIP2=1>
+ $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
if(CYGWIN)
- set_target_properties(libminizip PROPERTIES PREFIX "lib")
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}libminizip
+ PROPERTIES
+ PREFIX "lib")
else(CYGWIN)
- set_target_properties(libminizip
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}libminizip
PROPERTIES
SOVERSION ${zlib_VERSION_MAJOR}
VERSION ${INSTALL_VERSION})
endif(CYGWIN)
- set_target_properties(libminizip PROPERTIES EXPORT_NAME minizip)
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}libminizip
+ PROPERTIES
+ EXPORT_NAME minizip)
if(MSVC)
- set_target_properties(libminizip PROPERTIES OUTPUT_NAME libminizip)
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}libminizip
+ PROPERTIES
+ OUTPUT_NAME libminizip)
else(MSVC)
- set_target_properties(libminizip PROPERTIES OUTPUT_NAME minizip)
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}libminizip
+ PROPERTIES
+ OUTPUT_NAME minizip)
endif(MSVC)
- target_link_libraries(libminizip
- PUBLIC ZLIB::ZLIB
+ target_link_libraries(${ZLIB_CONTRIB_PREFIX}libminizip
+ PUBLIC
+ ZLIB::ZLIB
$<$<BOOL:${BZIP2_FOUND}>:BZip2::BZip2>)
- add_executable(minizip ${MINIZIP_SRCS} ${MINIZIP_HDRS})
- set_target_properties(minizip PROPERTIES EXPORT_NAME minizip_executable)
- target_compile_definitions(
- minizip PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>)
- target_link_libraries(minizip PRIVATE MINIZIP::minizip)
- add_executable(miniunzip ${MINIUNZIP_SRCS} ${MINIUNZIP_HDRS})
- set_target_properties(miniunzip PROPERTIES EXPORT_NAME miniunzip_executable)
- target_compile_definitions(
- miniunzip PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>)
- target_link_libraries(miniunzip PRIVATE MINIZIP::minizip)
+ add_executable(${ZLIB_CONTRIB_PREFIX}minizip
+ ${MINIZIP_SRCS}
+ ${MINIZIP_HDRS})
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}minizip
+ PROPERTIES
+ EXPORT_NAME minizip_executable
+ OUTPUT_NAME minizip)
+ target_compile_definitions(${ZLIB_CONTRIB_PREFIX}minizip
+ PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>)
+ target_link_libraries(${ZLIB_CONTRIB_PREFIX}minizip
+ PRIVATE MINIZIP::minizip)
+ add_executable(${ZLIB_CONTRIB_PREFIX}miniunzip
+ ${MINIUNZIP_SRCS}
+ ${MINIUNZIP_HDRS})
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}miniunzip
+ PROPERTIES
+ EXPORT_NAME miniunzip_executable
+ OUTPUT_NAME miniunzip)
+ target_compile_definitions(${ZLIB_CONTRIB_PREFIX}miniunzip
+ PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>)
+ target_link_libraries(${ZLIB_CONTRIB_PREFIX}miniunzip
+ PRIVATE MINIZIP::minizip)
endif(MINIZIP_BUILD_SHARED)
if(MINIZIP_BUILD_STATIC)
- add_library(libminizipstatic STATIC ${LIBMINIZIP_SRCS} ${LIBMINIZIP_HDRS})
- add_library(MINIZIP::minizipstatic ALIAS libminizipstatic)
- target_include_directories(
- libminizipstatic
- PUBLIC $<BUILD_INTERFACE:${minizip_SOURCE_DIR}>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
- target_compile_definitions(
- libminizipstatic
- PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
- $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>
- $<$<BOOL:${HAVE_UNISTD_H}>:HAVE_UNISTD_H=1>
- PUBLIC $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>
- $<$<BOOL:${BZIP2_FOUND}>:HAVE_BZIP2=1>
- $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
- set_target_properties(
- libminizipstatic PROPERTIES EXPORT_NAME minizipstatic)
+ add_library(${ZLIB_CONTRIB_PREFIX}libminizipstatic
+ STATIC
+ ${LIBMINIZIP_SRCS}
+ ${LIBMINIZIP_HDRS})
+ add_library(MINIZIP::minizipstatic ALIAS
+ ${ZLIB_CONTRIB_PREFIX}libminizipstatic)
+ target_include_directories(${ZLIB_CONTRIB_PREFIX}libminizipstatic
+ PUBLIC
+ $<BUILD_INTERFACE:${minizip_SOURCE_DIR}>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+ target_compile_definitions(${ZLIB_CONTRIB_PREFIX}libminizipstatic
+ PRIVATE
+ $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
+ $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>
+ $<$<BOOL:${HAVE_UNISTD_H}>:HAVE_UNISTD_H=1>
+ PUBLIC
+ $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>
+ $<$<BOOL:${BZIP2_FOUND}>:HAVE_BZIP2=1>
+ $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}libminizipstatic
+ PROPERTIES
+ EXPORT_NAME minizipstatic)
if(CYGWIN)
- set_target_properties(libminizipstatic PROPERTIES PREFIX "lib")
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}libminizipstatic
+ PROPERTIES
+ PREFIX "lib")
endif(CYGWIN)
if(MSVC)
- set_target_properties(libminizipstatic
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}libminizipstatic
PROPERTIES
ARCHIVE_OUTPUT_NAME libminizip${minizip_static_suffix})
else(MSVC)
- set_target_properties(libminizipstatic
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}libminizipstatic
PROPERTIES
ARCHIVE_OUTPUT_NAME minizip${minizip_static_suffix})
endif(MSVC)
if(CYGWIN)
- set_target_properties(libminizipstatic PROPERTIES SUFFIX ".dll.a")
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}libminizipstatic
+ PROPERTIES
+ SUFFIX ".dll.a")
endif(CYGWIN)
- target_link_libraries(libminizipstatic PUBLIC ZLIB::ZLIBSTATIC
- $<$<BOOL:${BZIP2_FOUND}>:BZip2::BZip2>)
-
- add_executable(minizipstatic ${MINIZIP_SRCS} ${MINIZIP_HDRS})
- set_target_properties(minizipstatic PROPERTIES EXPORT_NAME
- minizip_static_executable)
- target_compile_definitions(
- minizipstatic PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>)
- target_link_libraries(minizipstatic PRIVATE MINIZIP::minizipstatic)
- add_executable(miniunzipstatic ${MINIUNZIP_SRCS} ${MINIUNZIP_HDRS})
- set_target_properties(miniunzipstatic
- PROPERTIES EXPORT_NAME miniunzip_static_executable)
- target_compile_definitions(
- miniunzipstatic PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>)
- target_link_libraries(miniunzipstatic PRIVATE MINIZIP::minizipstatic)
+ target_link_libraries(${ZLIB_CONTRIB_PREFIX}libminizipstatic
+ PUBLIC
+ ZLIB::ZLIBSTATIC
+ $<$<BOOL:${BZIP2_FOUND}>:BZip2::BZip2>)
+
+ add_executable(${ZLIB_CONTRIB_PREFIX}minizipstatic
+ ${MINIZIP_SRCS}
+ ${MINIZIP_HDRS})
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}minizipstatic
+ PROPERTIES
+ EXPORT_NAME minizip_static_executable
+ OUTPUT_NAME minizipstatic)
+ target_compile_definitions(${ZLIB_CONTRIB_PREFIX}minizipstatic
+ PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>)
+ target_link_libraries(${ZLIB_CONTRIB_PREFIX}minizipstatic
+ PRIVATE MINIZIP::minizipstatic)
+ add_executable(${ZLIB_CONTRIB_PREFIX}miniunzipstatic
+ ${MINIUNZIP_SRCS}
+ ${MINIUNZIP_HDRS})
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}miniunzipstatic
+ PROPERTIES
+ EXPORT_NAME miniunzip_static_executable
+ OUTPUT_NAME miniunzipstatic)
+ target_compile_definitions(${ZLIB_CONTRIB_PREFIX}miniunzipstatic
+ PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>)
+ target_link_libraries(${ZLIB_CONTRIB_PREFIX}miniunzipstatic
+ PRIVATE MINIZIP::minizipstatic)
endif(MINIZIP_BUILD_STATIC)
if(MINIZIP_INSTALL)
if(MINIZIP_BUILD_SHARED)
install(
- TARGETS libminizip minizip miniunzip
+ TARGETS
+ ${ZLIB_CONTRIB_PREFIX}libminizip
+ ${ZLIB_CONTRIB_PREFIX}minizip
+ ${ZLIB_CONTRIB_PREFIX}miniunzip
COMPONENT Runtime
EXPORT minizipSharedExport
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
@@ -247,7 +297,7 @@ if(MINIZIP_INSTALL)
if(MSVC)
install(
- FILES $<TARGET_PDB_FILE:libminizip>
+ FILES $<TARGET_PDB_FILE:${ZLIB_CONTRIB_PREFIX}libminizip>
COMPONENT Runtime
DESTINATION ${CMAKE_INSTALL_BINDIR}
CONFIGURATIONS Debug OR RelWithDebInfo
@@ -257,9 +307,11 @@ if(MINIZIP_INSTALL)
if(MINIZIP_BUILD_STATIC)
install(
- TARGETS libminizipstatic
+ TARGETS
+ ${ZLIB_CONTRIB_PREFIX}libminizipstatic
+ ${ZLIB_CONTRIB_PREFIX}minizipstatic
+ ${ZLIB_CONTRIB_PREFIX}miniunzipstatic
COMPONENT Development
- TARGETS minizipstatic miniunzipstatic
COMPONENT Runtime
EXPORT minizipStaticExport
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
@@ -295,105 +347,124 @@ if(MINIZIP_BUILD_TESTING)
if(MINIZIP_BUILD_SHARED AND NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL
".dll")
add_test(
- NAME minizip_prepare_shared_zip
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_prepare_shared_zip
COMMAND ${CMAKE_COMMAND} -DCREATE_SHARED=ON -P
${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
add_test(
- NAME minizip_zipping_test_file_shared
- COMMAND minizip test_file_shared.zip test_file_shared.txt
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_zipping_test_file_shared
+ COMMAND ${ZLIB_CONTRIB_PREFIX}minizip test_file_shared.zip test_file_shared.txt
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
add_test(
- NAME minizip_prepare_shared_unzip
- COMMAND ${CMAKE_COMMAND} -DMOVE_SHARED=ON -P
- ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_prepare_shared_unzip
+ COMMAND ${CMAKE_COMMAND}
+ -DMOVE_SHARED=ON
+ -P
+ ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
add_test(
- NAME minizip_miniunzipping_test_file_shared.zip
- COMMAND miniunzip test_file_shared.zip
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_miniunzipping_test_file_shared.zip
+ COMMAND ${ZLIB_CONTRIB_PREFIX}miniunzip test_file_shared.zip
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
add_test(
- NAME minizip_compare_shared
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_compare_shared
COMMAND ${CMAKE_COMMAND} -E compare_files test_file_shared.txt
test_file_shared.orig
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
add_test(
- NAME minizip_clean_shared_zip
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_clean_shared_zip
COMMAND ${CMAKE_COMMAND} -DDELETE_SHARED=ON -P
${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
- set_tests_properties(minizip_prepare_shared_zip
- PROPERTIES FIXTURES_SETUP prepare_shared)
- set_tests_properties(
- minizip_zipping_test_file_shared
- PROPERTIES FIXTURES_REQUIRED prepare_shared FIXTURES_SETUP
- zip_shared)
- set_tests_properties(
- minizip_prepare_shared_unzip
- PROPERTIES FIXTURES_REQUIRED zip_shared FIXTURES_SETUP
- prepare_unzip_shared)
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_prepare_shared_zip
+ PROPERTIES
+ FIXTURES_SETUP prepare_shared)
set_tests_properties(
- minizip_miniunzipping_test_file_shared.zip
- PROPERTIES FIXTURES_REQUIRED prepare_unzip_shared FIXTURES_SETUP
- prepare_compare_shared)
+ ${ZLIB_CONTRIB_PREFIX}minizip_zipping_test_file_shared
+ PROPERTIES
+ FIXTURES_REQUIRED prepare_shared
+ FIXTURES_SETUP zip_shared)
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_prepare_shared_unzip
+ PROPERTIES
+ FIXTURES_REQUIRED zip_shared
+ FIXTURES_SETUP prepare_unzip_shared)
set_tests_properties(
- minizip_compare_shared
- PROPERTIES FIXTURES_REQUIRED prepare_compare_shared FIXTURES_SETUP
- compared_shared)
- set_tests_properties(minizip_clean_shared_zip
- PROPERTIES FIXTURES_CLEANUP compared_shared)
+ ${ZLIB_CONTRIB_PREFIX}minizip_miniunzipping_test_file_shared.zip
+ PROPERTIES
+ FIXTURES_REQUIRED prepare_unzip_shared
+ FIXTURES_SETUP prepare_compare_shared)
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_compare_shared
+ PROPERTIES
+ FIXTURES_REQUIRED prepare_compare_shared
+ FIXTURES_SETUP compared_shared)
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_clean_shared_zip
+ PROPERTIES
+ FIXTURES_CLEANUP compared_shared)
endif(MINIZIP_BUILD_SHARED AND NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL
".dll")
if(MINIZIP_BUILD_STATIC)
add_test(
- NAME minizip_prepare_static_zip
- COMMAND ${CMAKE_COMMAND} -DCREATE_STATIC=ON -P
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_prepare_static_zip
+ COMMAND ${CMAKE_COMMAND}
+ -DCREATE_STATIC=ON
+ -P
${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
add_test(
- NAME minizip_zipping_test_file_static
- COMMAND minizipstatic test_file_static.zip test_file_static.txt
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_zipping_test_file_static
+ COMMAND ${ZLIB_CONTRIB_PREFIX}minizipstatic
+ test_file_static.zip
+ test_file_static.txt
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
add_test(
- NAME minizip_prepare_static_unzip
- COMMAND ${CMAKE_COMMAND} -DMOVE_STATIC=ON -P
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_prepare_static_unzip
+ COMMAND ${CMAKE_COMMAND}
+ -DMOVE_STATIC=ON
+ -P
${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
add_test(
- NAME minizip_miniunzipping_test_file_static.zip
- COMMAND miniunzipstatic test_file_static.zip
+ NAME
+ ${ZLIB_CONTRIB_PREFIX}minizip_miniunzipping_test_file_static.zip
+ COMMAND ${ZLIB_CONTRIB_PREFIX}miniunzipstatic
+ test_file_static.zip
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
add_test(
- NAME minizip_compare_static
- COMMAND ${CMAKE_COMMAND} -E compare_files test_file_static.txt
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_compare_static
+ COMMAND ${CMAKE_COMMAND}
+ -E compare_files
+ test_file_static.txt
test_file_static.orig
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
add_test(
- NAME minizip_clean_static_zip
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_clean_static_zip
COMMAND ${CMAKE_COMMAND} -DDELETE_STATIC=ON -P
${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
- set_tests_properties(minizip_prepare_static_zip
- PROPERTIES FIXTURES_SETUP prepare_static)
- set_tests_properties(
- minizip_zipping_test_file_static
- PROPERTIES FIXTURES_REQUIRED prepare_static FIXTURES_SETUP
- zip_static)
- set_tests_properties(
- minizip_prepare_static_unzip
- PROPERTIES FIXTURES_REQUIRED zip_static FIXTURES_SETUP
- prepare_unzip_static)
- set_tests_properties(
- minizip_miniunzipping_test_file_static.zip
- PROPERTIES FIXTURES_REQUIRED prepare_unzip_static FIXTURES_SETUP
- prepare_compare_static)
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_prepare_static_zip
+ PROPERTIES
+ FIXTURES_SETUP prepare_static)
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_zipping_test_file_static
+ PROPERTIES
+ FIXTURES_REQUIRED prepare_static
+ FIXTURES_SETUP zip_static)
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_prepare_static_unzip
+ PROPERTIES
+ FIXTURES_REQUIRED zip_static
+ FIXTURES_SETUP prepare_unzip_static)
set_tests_properties(
- minizip_compare_static
- PROPERTIES FIXTURES_REQUIRED prepare_compare_static FIXTURES_SETUP
- compared_static)
- set_tests_properties(minizip_clean_static_zip
- PROPERTIES FIXTURES_CLEANUP compared_static)
+ ${ZLIB_CONTRIB_PREFIX}minizip_miniunzipping_test_file_static.zip
+ PROPERTIES
+ FIXTURES_REQUIRED prepare_unzip_static
+ FIXTURES_SETUP prepare_compare_static)
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_compare_static
+ PROPERTIES
+ FIXTURES_REQUIRED prepare_compare_static
+ FIXTURES_SETUP compared_static)
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_clean_static_zip
+ PROPERTIES
+ FIXTURES_CLEANUP compared_static)
endif(MINIZIP_BUILD_STATIC)
add_subdirectory(test)
diff --git a/contrib/minizip/test/CMakeLists.txt b/contrib/minizip/test/CMakeLists.txt
index df864a2..62a416c 100644
--- a/contrib/minizip/test/CMakeLists.txt
+++ b/contrib/minizip/test/CMakeLists.txt
@@ -51,7 +51,7 @@ endif(GENERATOR)
# find_package_test
#
add_test(
- NAME minizip_find_package_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_find_package_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -66,16 +66,16 @@ add_test(
-S${WORK_DIR}/minizip_find_package_test)
add_test(
- NAME minizip_find_package_build
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_find_package_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY ${WORK_DIR}/minizip_find_package_test_build)
-set_tests_properties(minizip_find_package_configure
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_find_package_configure
PROPERTIES
FIXTURES_REQUIRED ${inst_setup}
FIXTURES_SETUP mzfp_config)
-set_tests_properties(minizip_find_package_build
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_find_package_build
PROPERTIES
FIXTURES_REQUIRED mzfp_config)
@@ -83,7 +83,7 @@ set_tests_properties(minizip_find_package_build
# find_package_no_components_test
#
add_test(
- NAME minizip_find_package_no_components_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_find_package_no_components_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -97,21 +97,23 @@ add_test(
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/minizip_find_package_no_components_test)
-set_tests_properties(minizip_find_package_no_components_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup})
+set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}minizip_find_package_no_components_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup})
if(NOT MINIZIP_BUILD_SHARED OR NOT MINIZIP_BUILD_STATIC)
- set_tests_properties(minizip_find_package_no_components_configure
- PROPERTIES
- WILL_FAIL TRUE)
+ set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}minizip_find_package_no_components_configure
+ PROPERTIES
+ WILL_FAIL TRUE)
endif(NOT MINIZIP_BUILD_SHARED OR NOT MINIZIP_BUILD_STATIC)
#
# find_package_no_components_test
#
add_test(
- NAME minizip_find_package_wrong_components_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_find_package_wrong_components_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -125,16 +127,17 @@ add_test(
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/minizip_find_package_wrong_components_test)
-set_tests_properties(minizip_find_package_wrong_components_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- WILL_FAIL TRUE)
+set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}minizip_find_package_wrong_components_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup}
+ WILL_FAIL TRUE)
#
# add_subdirectory_test
#
add_test(
- NAME minizip_add_subdirectory_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_add_subdirectory_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -148,16 +151,16 @@ add_test(
-S${WORK_DIR}/minizip_add_subdirectory_test)
add_test(
- NAME minizip_add_subdirectory_build
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_add_subdirectory_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY ${WORK_DIR}/minizip_add_subdirectory_test_build)
-set_tests_properties(minizip_add_subdirectory_configure
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_add_subdirectory_configure
PROPERTIES
FIXTURES_REQUIRED ${inst_setup}
FIXTURES_SETUP mzas_config)
-set_tests_properties(minizip_add_subdirectory_build
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_add_subdirectory_build
PROPERTIES
FIXTURES_REQUIRED mzas_config)
@@ -165,7 +168,7 @@ set_tests_properties(minizip_add_subdirectory_build
# add_subdirectory_exclude_test
#
add_test(
- NAME minizip_add_subdirectory_exclude_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_add_subdirectory_exclude_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -180,16 +183,17 @@ add_test(
-S${WORK_DIR}/minizip_add_subdirectory_exclude_test)
add_test(
- NAME minizip_add_subdirectory_exclude_build
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_add_subdirectory_exclude_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY
${WORK_DIR}/minizip_add_subdirectory_exclude_test_build)
-set_tests_properties(minizip_add_subdirectory_exclude_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- FIXTURES_SETUP mzasx_config)
+set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}minizip_add_subdirectory_exclude_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup}
+ FIXTURES_SETUP mzasx_config)
-set_tests_properties(minizip_add_subdirectory_exclude_build
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_add_subdirectory_exclude_build
PROPERTIES
FIXTURES_REQUIRED mzasx_config)
diff --git a/contrib/puff/CMakeLists.txt b/contrib/puff/CMakeLists.txt
index 8e0b6a1..b08a630 100644
--- a/contrib/puff/CMakeLists.txt
+++ b/contrib/puff/CMakeLists.txt
@@ -36,14 +36,14 @@ if(NOT DEFINED ZLIB_BUILD_PUFF)
endif(NOT DEFINED ZLIB_BUILD_PUFF)
if(WIN32 OR CYGWIN)
- set(zlibpuff_static_suffix "s")
+ set(puff_static_suffix "s")
set(CMAKE_DEBUG_POSTFIX "d")
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
endif(WIN32 OR CYGWIN)
if(ZLIB_PUFF_BUILD_TESTING)
enable_testing()
- add_executable(zlib_puff_bin-writer bin-writer.c)
+ add_executable(${ZLIB_CONTRIB_PREFIX}puff_bin-writer bin-writer.c)
if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR
${CMAKE_C_COMPILER_ID} STREQUAL "Clang")
@@ -74,43 +74,43 @@ if(ZLIB_PUFF_BUILD_TESTING)
endif(ZLIB_PUFF_BUILD_TESTING)
if(ZLIB_PUFF_BUILD_SHARED)
- add_library(zlib_puff_puff SHARED
+ add_library(${ZLIB_CONTRIB_PREFIX}puff_puff SHARED
puff.c
puff.h)
- add_library(PUFF::PUFF ALIAS zlib_puff_puff)
+ add_library(PUFF::PUFF ALIAS ${ZLIB_CONTRIB_PREFIX}puff_puff)
if(NOT CYGWIN)
- set_target_properties(zlib_puff_puff
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}puff_puff
PROPERTIES
SOVERSION ${puff_VERSION_MAJOR}
VERSION ${puff_VERSION})
endif(NOT CYGWIN)
set_target_properties(
- zlib_puff_puff
+ ${ZLIB_CONTRIB_PREFIX}puff_puff
PROPERTIES
EXPORT_NAME PUFF
OUTPUT_NAME puff)
endif(ZLIB_PUFF_BUILD_SHARED)
if(ZLIB_PUFF_BUILD_STATIC)
- add_library(zlib_puff_puffStatic STATIC
+ add_library(${ZLIB_CONTRIB_PREFIX}puff_puffStatic STATIC
puff.c
puff.h)
- add_library(PUFF::PUFFSTATIC ALIAS zlib_puff_puffStatic)
+ add_library(PUFF::PUFFSTATIC ALIAS ${ZLIB_CONTRIB_PREFIX}puff_puffStatic)
- set_target_properties(zlib_puff_puffStatic
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}puff_puffStatic
PROPERTIES
EXPORT_NAME PUFFSTATIC
- OUTPUT_NAME puff${zlib_puff_static_suffix})
+ OUTPUT_NAME puff${puff_static_suffix})
endif(ZLIB_PUFF_BUILD_STATIC)
if(ZLIB_PUFF_INSTALL)
if(ZLIB_PUFF_BUILD_SHARED)
install(
- TARGETS zlib_puff_puff
+ TARGETS ${ZLIB_CONTRIB_PREFIX}puff_puff
COMPONENT Runtime
EXPORT puffSharedExport
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
@@ -123,7 +123,7 @@ if(ZLIB_PUFF_INSTALL)
if(MSVC)
install(
- FILES $<TARGET_PDB_FILE:zlib_puff_puff>
+ FILES $<TARGET_PDB_FILE:${ZLIB_CONTRIB_PREFIX}puff_puff>
COMPONENT Development
DESTINATION ${CMAKE_INSTALL_BINDIR}
CONFIGURATIONS Debug OR RelWithDebInfo
@@ -133,7 +133,7 @@ if(ZLIB_PUFF_INSTALL)
if(ZLIB_PUFF_BUILD_STATIC)
install(
- TARGETS zlib_puff_puffStatic
+ TARGETS ${ZLIB_CONTRIB_PREFIX}puff_puffStatic
COMPONENT Development
EXPORT puffStaticExport
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
diff --git a/contrib/puff/test/CMakeLists.txt b/contrib/puff/test/CMakeLists.txt
index 96a2775..96921a7 100644
--- a/contrib/puff/test/CMakeLists.txt
+++ b/contrib/puff/test/CMakeLists.txt
@@ -5,86 +5,90 @@ if(NOT DEFINED ZLIB_BUILD_PUFF)
set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}")
add_test(
- NAME zlib_puff_install
+ NAME puff_install
COMMAND ${CMAKE_COMMAND}
--install ${puff_BINARY_DIR}
--prefix ${WORK_DIR}/test_install
--config $<CONFIG>
WORKING_DIRECTORY ${WORK_DIR})
- set_tests_properties(zlib_puff_install
+ set_tests_properties(puff_install
PROPERTIES
- FIXTURES_SETUP zlib_puff_install)
+ FIXTURES_SETUP puff_install)
endif(NOT DEFINED ZLIB_BUILD_PUFF)
if(ZLIB_PUFF_BUILD_SHARED AND NOT WIN32)
- add_executable(zlib_puff_test
+ add_executable(${ZLIB_CONTRIB_PREFIX}puff_test
${puff_SOURCE_DIR}/pufftest.c
${puff_SOURCE_DIR}/puff.h)
- target_link_libraries(zlib_puff_test
- PRIVATE zlib_puff_puff)
+ target_link_libraries(${ZLIB_CONTRIB_PREFIX}puff_test
+ PRIVATE ${ZLIB_CONTRIB_PREFIX}puff_puff)
- add_test(NAME zlib_puff_test
+ add_test(NAME ${ZLIB_CONTRIB_PREFIX}puff_test
COMMAND ${CMAKE_COMMAND} -P
${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
- "$<TARGET_FILE:zlib_puff_test>"
+ "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}puff_test>"
"${puff_SOURCE_DIR}")
if(GCOV_EXECUTABLE)
- add_executable(zlib_puff_test-coverage
+ add_executable(${ZLIB_CONTRIB_PREFIX}puff_test-coverage
${puff_SOURCE_DIR}/pufftest.c
${puff_SOURCE_DIR}/puff.c
${puff_SOURCE_DIR}/puff.h)
- target_compile_options(zlib_puff_test-coverage PRIVATE -coverage)
+ target_compile_options(${ZLIB_CONTRIB_PREFIX}puff_test-coverage
+ PRIVATE
+ -coverage)
- target_link_options(zlib_puff_test-coverage PRIVATE -coverage)
+ target_link_options(${ZLIB_CONTRIB_PREFIX}puff_test-coverage
+ PRIVATE
+ -coverage)
- add_test(NAME zlib_puff_test-coverage
+ add_test(NAME ${ZLIB_CONTRIB_PREFIX}puff_test-coverage
COMMAND ${CMAKE_COMMAND}
-P
${CMAKE_CURRENT_SOURCE_DIR}/tester-cov.cmake
- "$<TARGET_FILE:zlib_puff_test-coverage>"
+ "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}puff_test-coverage>"
"${puff_SOURCE_DIR}"
- "$<TARGET_FILE:zlib_puff_bin-writer>"
+ "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}puff_bin-writer>"
${GCOV_EXECUTABLE}
${llvm_option})
endif(GCOV_EXECUTABLE)
endif(ZLIB_PUFF_BUILD_SHARED AND NOT WIN32)
if(ZLIB_PUFF_BUILD_STATIC AND NOT WIN32)
- add_executable(zlib_puff_testStatic
+ add_executable(${ZLIB_CONTRIB_PREFIX}puff_testStatic
${puff_SOURCE_DIR}/pufftest.c
${puff_SOURCE_DIR}/puff.h)
- target_link_libraries(zlib_puff_testStatic
- PRIVATE zlib_puff_puffStatic)
- add_test(NAME zlib_puff_testStatic
+ target_link_libraries(${ZLIB_CONTRIB_PREFIX}puff_testStatic
+ PRIVATE ${ZLIB_CONTRIB_PREFIX}puff_puffStatic)
+ add_test(NAME ${ZLIB_CONTRIB_PREFIX}puff_testStatic
COMMAND ${CMAKE_COMMAND} -P
${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
- "$<TARGET_FILE:zlib_puff_testStatic>"
+ "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}puff_testStatic>"
"${puff_SOURCE_DIR}")
if(GCOV_EXECUTABLE)
- add_executable(zlib_puff_testStatic-coverage
+ add_executable(${ZLIB_CONTRIB_PREFIX}puff_testStatic-coverage
${puff_SOURCE_DIR}/pufftest.c
${puff_SOURCE_DIR}/puff.c
${puff_SOURCE_DIR}/puff.h)
- target_compile_options(zlib_puff_testStatic-coverage
+ target_compile_options(${ZLIB_CONTRIB_PREFIX}puff_testStatic-coverage
PRIVATE -coverage)
- target_link_options(zlib_puff_testStatic-coverage
+ target_link_options(${ZLIB_CONTRIB_PREFIX}puff_testStatic-coverage
PRIVATE -coverage)
- add_test(NAME zlib_puff_testStatic-coverage
+ add_test(NAME ${ZLIB_CONTRIB_PREFIX}puff_testStatic-coverage
COMMAND ${CMAKE_COMMAND}
-P
${CMAKE_CURRENT_SOURCE_DIR}/tester-cov.cmake
- "$<TARGET_FILE:zlib_puff_testStatic-coverage>"
+ "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}puff_testStatic-coverage>"
"${puff_SOURCE_DIR}"
- "$<TARGET_FILE:zlib_puff_bin-writer>"
+ "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}puff_bin-writer>"
${GCOV_EXECUTABLE}
${llvm_option})
endif(GCOV_EXECUTABLE)
@@ -124,7 +128,7 @@ endif(GENERATOR)
# find_package_test
#
add_test(
- NAME zlib_puff_find_package_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}puff_find_package_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -139,16 +143,16 @@ add_test(
-S${WORK_DIR}/puff_find_package_test)
add_test(
- NAME zlib_puff_find_package_build
+ NAME ${ZLIB_CONTRIB_PREFIX}puff_find_package_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY ${WORK_DIR}/puff_find_package_test_build)
-set_tests_properties(zlib_puff_find_package_configure
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}puff_find_package_configure
PROPERTIES
FIXTURES_REQUIRED ${inst_setup}
FIXTURES_SETUP puff_fp_config)
-set_tests_properties(zlib_puff_find_package_build
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}puff_find_package_build
PROPERTIES
FIXTURES_REQUIRED puff_fp_config)
@@ -156,7 +160,7 @@ set_tests_properties(zlib_puff_find_package_build
# add_subdirectory_test
#
add_test(
- NAME zlib_puff_add_subdirectory_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}puff_add_subdirectory_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -171,16 +175,16 @@ add_test(
-S${WORK_DIR}/puff_add_subdirectory_test)
add_test(
- NAME zlib_puff_add_subdirectory_build
+ NAME ${ZLIB_CONTRIB_PREFIX}puff_add_subdirectory_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY ${WORK_DIR}/puff_add_subdirectory_test_build)
-set_tests_properties(zlib_puff_add_subdirectory_configure
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}puff_add_subdirectory_configure
PROPERTIES
FIXTURES_REQUIRED ${inst_setup}
FIXTURES_SETUP puiff_as_config)
-set_tests_properties(zlib_puff_add_subdirectory_build
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}puff_add_subdirectory_build
PROPERTIES
FIXTURES_REQUIRED puff_as_config)
@@ -188,7 +192,7 @@ set_tests_properties(zlib_puff_add_subdirectory_build
# add_subdirectory_exclude_test
#
add_test(
- NAME zlib_puff_add_subdirectory_exclude_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}puff_add_subdirectory_exclude_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -203,17 +207,18 @@ add_test(
-S${WORK_DIR}/puff_add_subdirectory_exclude_test)
add_test(
- NAME zlib_puff_add_subdirectory_exclude_build
+ NAME ${ZLIB_CONTRIB_PREFIX}puff_add_subdirectory_exclude_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY
${WORK_DIR}/puff_add_subdirectory_exclude_test_build)
-set_tests_properties(zlib_puff_add_subdirectory_exclude_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- FIXTURES_SETUP puff_asx_config)
+set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}puff_add_subdirectory_exclude_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup}
+ FIXTURES_SETUP puff_asx_config)
-set_tests_properties(zlib_puff_add_subdirectory_exclude_build
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}puff_add_subdirectory_exclude_build
PROPERTIES
FIXTURES_REQUIRED puff_asx_config)
@@ -221,7 +226,7 @@ set_tests_properties(zlib_puff_add_subdirectory_exclude_build
# find_package_no_components_test
#
add_test(
- NAME zlib_puff_find_package_no_components_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}puff_find_package_no_components_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -235,21 +240,23 @@ add_test(
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/puff_find_package_no_components_test)
-set_tests_properties(zlib_puff_find_package_no_components_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup})
+set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}puff_find_package_no_components_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup})
if(NOT ZLIB_PUFF_BUILD_SHARED OR NOT ZLIB_PUFF_BUILD_STATIC)
- set_tests_properties(zlib_puff_find_package_no_components_configure
- PROPERTIES
- WILL_FAIL TRUE)
+ set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}puff_find_package_no_components_configure
+ PROPERTIES
+ WILL_FAIL TRUE)
endif(NOT ZLIB_PUFF_BUILD_SHARED OR NOT ZLIB_PUFF_BUILD_STATIC)
#
# find_package_no_components_test
#
add_test(
- NAME zlib_puff_find_package_wrong_components_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}puff_find_package_wrong_components_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -263,7 +270,8 @@ add_test(
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/puff_find_package_wrong_components_test)
-set_tests_properties(zlib_puff_find_package_wrong_components_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- WILL_FAIL TRUE)
+set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}puff_find_package_wrong_components_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup}
+ WILL_FAIL TRUE)
diff --git a/contrib/testzlib/CMakeLists.txt b/contrib/testzlib/CMakeLists.txt
index 5280e2c..a894fb6 100644
--- a/contrib/testzlib/CMakeLists.txt
+++ b/contrib/testzlib/CMakeLists.txt
@@ -32,32 +32,33 @@ if(NOT ZLIB_BUILD_TESTZLIB)
endif(NOT ZLIB_BUILD_TESTZLIB)
if(ZLIB_TESTZLIB_BUILD_SHARED)
- add_executable(zlib_testzlib testzlib.c)
- target_link_libraries(zlib_testzlib PRIVATE ZLIB::ZLIB)
+ add_executable(${ZLIB_CONTRIB_PREFIX}testzlib testzlib.c)
+ target_link_libraries(${ZLIB_CONTRIB_PREFIX}testzlib PRIVATE ZLIB::ZLIB)
- set_target_properties(zlib_testzlib
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}testzlib
PROPERTIES
OUTPUT_NAME testzlib)
if(ZLIB_TESTZLIB_INSTALL)
install(
- TARGETS zlib_testzlib
+ TARGETS ${ZLIB_CONTRIB_PREFIX}testzlib
COMPONENT Runtime
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
endif(ZLIB_TESTZLIB_INSTALL)
endif(ZLIB_TESTZLIB_BUILD_SHARED)
if(ZLIB_TESTZLIB_BUILD_STATIC)
- add_executable(zlib_testzlibStatic testzlib.c)
- target_link_libraries(zlib_testzlibStatic PRIVATE ZLIB::ZLIBSTATIC)
+ add_executable(${ZLIB_CONTRIB_PREFIX}testzlibStatic testzlib.c)
+ target_link_libraries(${ZLIB_CONTRIB_PREFIX}testzlibStatic
+ PRIVATE ZLIB::ZLIBSTATIC)
- set_target_properties(zlib_testzlibStatic
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}testzlibStatic
PROPERTIES
OUTPUT_NAME testzlibStatic)
if(ZLIB_TESTZLIB_INSTALL)
install(
- TARGETS zlib_testzlibStatic
+ TARGETS ${ZLIB_CONTRIB_PREFIX}testzlibStatic
COMPONENT Runtime
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
endif(ZLIB_TESTZLIB_INSTALL)
diff --git a/contrib/zlib1-dll/CMakeLists.txt b/contrib/zlib1-dll/CMakeLists.txt
index ed19dde..54f481e 100644
--- a/contrib/zlib1-dll/CMakeLists.txt
+++ b/contrib/zlib1-dll/CMakeLists.txt
@@ -176,13 +176,17 @@ cmake_path(SET p2 "../../")
cmake_path(ABSOLUTE_PATH "p1" OUTPUT_VARIABLE DOTDOT)
cmake_path(ABSOLUTE_PATH "p2" OUTPUT_VARIABLE DOTMINIZIP)
-add_library(zlib1 SHARED ${ZLIB1-DLL_SRCS}
+add_library(${ZLIB_CONTRIB_PREFIX}zlib1 SHARED ${ZLIB1-DLL_SRCS}
${ZLIB1-DLL_PUBLIC_HDRS}
${ZLIB1-DLL_PRIVATE_HDRS})
-add_library(ZLIB1DLL::ZLIB1DLL ALIAS zlib1)
+add_library(ZLIB1DLL::ZLIB1DLL ALIAS ${ZLIB_CONTRIB_PREFIX}zlib1)
-target_compile_definitions(zlib1
+set_target_properties(${ZLIB_CONTRIB_PREFIX}zlib1
+ PROPERTIES
+ OUTPUT_NAME zlib1)
+
+target_compile_definitions(${ZLIB_CONTRIB_PREFIX}zlib1
PRIVATE ZLIB_BUILD
$<$<BOOL:NOT:${HAVE_FSEEKO}>:NO_FSEEKO>
$<$<BOOL:${HAVE_UNISTD_H}>:HAVE_UNISTD_H=1>
@@ -193,32 +197,36 @@ target_compile_definitions(zlib1
$<$<BOOL:${BZIP2_FOUND}>:HAVE_BZIP2=1>
$<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
-target_include_directories(zlib1
+target_include_directories(${ZLIB_CONTRIB_PREFIX}zlib1
PUBLIC $<BUILD_INTERFACE:${DOTDOT}>
$<BUILD_INTERFACE:${DOTMINIZIP}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-target_link_libraries(zlib1
+target_link_libraries(${ZLIB_CONTRIB_PREFIX}zlib1
PUBLIC $<$<BOOL:${BZIP2_FOUND}>:BZip2::BZip2>)
-set_target_properties(zlib1 PROPERTIES
+set_target_properties(${ZLIB_CONTRIB_PREFIX}zlib1 PROPERTIES
DEFINE_SYMBOL ZLIB_DLL
EXPORT_NAME ZLIB1DLL)
-add_library(zlibwapi SHARED ${ZLIB1-DLL_SRCS}
+add_library(${ZLIB_CONTRIB_PREFIX}zlibwapi SHARED ${ZLIB1-DLL_SRCS}
${ZLIB1-DLL_PUBLIC_HDRS}
${ZLIB1-DLL_PRIVATE_HDRS})
-add_library(ZLIB1DLL::ZLIBWAPI ALIAS zlibwapi)
+add_library(ZLIB1DLL::ZLIBWAPI ALIAS ${ZLIB_CONTRIB_PREFIX}zlibwapi)
+
+set_target_properties(${ZLIB_CONTRIB_PREFIX}zlibwapi
+ PROPERTIES
+ OUTPUT_NAME zlibwapi)
-target_include_directories(zlibwapi
+target_include_directories(${ZLIB_CONTRIB_PREFIX}zlibwapi
PUBLIC $<BUILD_INTERFACE:${DOTDOT}>
$<BUILD_INTERFACE:${DOTMINIZIP}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-target_compile_definitions(zlibwapi
+target_compile_definitions(${ZLIB_CONTRIB_PREFIX}zlibwapi
PRIVATE ZLIB_BUILD
$<$<BOOL:NOT:${HAVE_FSEEKO}>:NO_FSEEKO>
$<$<BOOL:${HAVE_UNISTD_H}>:HAVE_UNISTD_H=1>
@@ -230,27 +238,27 @@ target_compile_definitions(zlibwapi
$<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>
ZLIB_WINAPI)
-target_link_libraries(zlibwapi
+target_link_libraries(${ZLIB_CONTRIB_PREFIX}zlibwapi
PUBLIC $<$<BOOL:${BZIP2_FOUND}>:BZip2::BZip2>)
if(NOT CYGWIN)
- set_target_properties(zlib1
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}zlib1
PROPERTIES
SOVERSION ${zlib1-dll_VERSION_MAJOR}
VERSION ${zlib1-dll_VERSION})
- set_target_properties(zlibwapi
+ set_target_properties(${ZLIB_CONTRIB_PREFIX}zlibwapi
PROPERTIES
SOVERSION ${zlib1-dll_VERSION_MAJOR}
VERSION ${zlib1-dll_VERSION})
endif(NOT CYGWIN)
-set_target_properties(zlibwapi PROPERTIES
+set_target_properties(${ZLIB_CONTRIB_PREFIX}zlibwapi PROPERTIES
DEFINE_SYMBOL ZLIB_DLL
EXPORT_NAME ZLIBWAPI)
if(ZLIB1_DLL_INSTALL)
install(
- TARGETS zlib1 zlibwapi
+ TARGETS ${ZLIB_CONTRIB_PREFIX}zlib1 ${ZLIB_CONTRIB_PREFIX}zlibwapi
COMPONENT Runtime
EXPORT zlibDllExport
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
@@ -264,8 +272,8 @@ if(ZLIB1_DLL_INSTALL)
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib1dll)
install(
- FILES $<TARGET_PDB_FILE:zlib1>
- $<TARGET_PDB_FILE:zlibwapi>
+ FILES $<TARGET_PDB_FILE:${ZLIB_CONTRIB_PREFIX}zlib1>
+ $<TARGET_PDB_FILE:${ZLIB_CONTRIB_PREFIX}zlibwapi>
COMPONENT Runtime
DESTINATION ${CMAKE_INSTALL_BINDIR}
CONFIGURATIONS Debug OR RelWithDebInfo
diff --git a/contrib/zlib1-dll/test/CMakeLists.txt b/contrib/zlib1-dll/test/CMakeLists.txt
index 71c8b72..32c013a 100644
--- a/contrib/zlib1-dll/test/CMakeLists.txt
+++ b/contrib/zlib1-dll/test/CMakeLists.txt
@@ -41,7 +41,7 @@ endif(GENERATOR)
# findpackage_test
#
add_test(
- NAME zlib1-dll_find_package_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}zlib1-dll_find_package_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -56,16 +56,16 @@ add_test(
-S${WORK_DIR}/zlib1-dll_find_package_test)
add_test(
- NAME zlib1-dll_find_package_build
+ NAME ${ZLIB_CONTRIB_PREFIX}zlib1-dll_find_package_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY ${WORK_DIR}/zlib1-dll_find_package_test_build)
-set_tests_properties(zlib1-dll_find_package_configure
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}zlib1-dll_find_package_configure
PROPERTIES
FIXTURES_REQUIRED ${inst_setup}
FIXTURES_SETUP z1dll_config)
-set_tests_properties(zlib1-dll_find_package_build
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}zlib1-dll_find_package_build
PROPERTIES
FIXTURES_REQUIRED z1dll_config)
@@ -73,7 +73,7 @@ set_tests_properties(zlib1-dll_find_package_build
# add_subdirectory_test
#
add_test(
- NAME zlib1-dll_add_subdirectory_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}zlib1-dll_add_subdirectory_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -88,16 +88,16 @@ add_test(
-S${WORK_DIR}/zlib1-dll_add_subdirectory_test)
add_test(
- NAME zlib1-dll_add_subdirectory_build
+ NAME ${ZLIB_CONTRIB_PREFIX}zlib1-dll_add_subdirectory_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY ${WORK_DIR}/zlib1-dll_add_subdirectory_test_build)
-set_tests_properties(zlib1-dll_add_subdirectory_configure
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}zlib1-dll_add_subdirectory_configure
PROPERTIES
FIXTURES_REQUIRED ${inst_setup}
FIXTURES_SETUP z1dll_config)
-set_tests_properties(zlib1-dll_add_subdirectory_build
+set_tests_properties(${ZLIB_CONTRIB_PREFIX}zlib1-dll_add_subdirectory_build
PROPERTIES
FIXTURES_REQUIRED z1dll_config)
@@ -105,7 +105,7 @@ set_tests_properties(zlib1-dll_add_subdirectory_build
# add_subdirectory_exclude_test
#
add_test(
- NAME zlib1-dll_add_subdirectory_exclude_configure
+ NAME ${ZLIB_CONTRIB_PREFIX}zlib1-dll_add_subdirectory_exclude_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -120,16 +120,18 @@ add_test(
-S${WORK_DIR}/zlib1-dll_add_subdirectory_exclude_test)
add_test(
- NAME zlib1-dll_add_subdirectory_exclude_build
+ NAME ${ZLIB_CONTRIB_PREFIX}zlib1-dll_add_subdirectory_exclude_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY
${WORK_DIR}/zlib1-dll_add_subdirectory_exclude_test_build)
-set_tests_properties(zlib1-dll_add_subdirectory_exclude_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- FIXTURES_SETUP z1dllx_config)
+set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}zlib1-dll_add_subdirectory_exclude_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup}
+ FIXTURES_SETUP z1dllx_config)
-set_tests_properties(zlib1-dll_add_subdirectory_exclude_build
- PROPERTIES
- FIXTURES_REQUIRED z1dllx_config)
+set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}zlib1-dll_add_subdirectory_exclude_build
+ PROPERTIES
+ FIXTURES_REQUIRED z1dllx_config)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8fb924c..e91e54c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -19,10 +19,13 @@ if(ZLIB_BUILD_SHARED)
target_compile_definitions(zlib_example PRIVATE ZLIB_BUILD)
add_test(NAME zlib_example COMMAND zlib_example)
- add_executable(minigzip minigzip.c)
+ add_executable(zlib_minigzip minigzip.c)
target_compile_definitions(
- minigzip PRIVATE $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>)
- target_link_libraries(minigzip ZLIB::ZLIB)
+ zlib_minigzip PRIVATE $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>)
+ target_link_libraries(zlib_minigzip ZLIB::ZLIB)
+ set_target_properties(zlib_minigzip
+ PROPERTIES
+ OUTPUT_NAME minigzip)
if(MSVC
OR MSYS
@@ -66,8 +69,11 @@ if(ZLIB_BUILD_STATIC)
$<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>)
add_test(NAME zlib_examplestatic COMMAND zlib_examplestatic)
- add_executable(minigzipstatic minigzip.c)
- target_link_libraries(minigzipstatic ZLIB::ZLIBSTATIC)
+ add_executable(zlib_minigzipstatic minigzip.c)
+ target_link_libraries(zlib_minigzipstatic ZLIB::ZLIBSTATIC)
+ set_target_properties(zlib_minigzipstatic
+ PROPERTIES
+ OUTPUT_NAME minigzipstatic)
if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR
${CMAKE_C_COMPILER_ID} STREQUAL "Clang")