aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVollstrecker <werner@vollstreckernet.de>2024-12-30 11:14:36 +0100
committerMark Adler <madler@alumni.caltech.edu>2025-01-31 20:02:26 -0800
commite843c631d6c677bb8585c31b0b960d281cfc42bc (patch)
tree8bc001320bb365d78ab1e281750c7651b7151765
parentd51255713b9f7438ac9ecb2d144d8253fb9f8be8 (diff)
downloadzlib-e843c631d6c677bb8585c31b0b960d281cfc42bc.tar.gz
zlib-e843c631d6c677bb8585c31b0b960d281cfc42bc.tar.bz2
zlib-e843c631d6c677bb8585c31b0b960d281cfc42bc.zip
CMake: Refine tests.
Diffstat
-rw-r--r--contrib/minizip/test/CMakeLists.txt116
-rw-r--r--contrib/minizip/test/add_subdirectory_exclude_test.cmake.in38
-rw-r--r--contrib/minizip/test/add_subdirectory_test.cmake.in38
-rw-r--r--contrib/minizip/test/find_package_test.cmake.in35
-rw-r--r--test/CMakeLists.txt48
-rw-r--r--test/add_subdirectory_exclude_test.cmake.in21
-rw-r--r--test/add_subdirectory_test.cmake.in21
-rw-r--r--test/find_package_test.cmake.in18
8 files changed, 169 insertions, 166 deletions
diff --git a/contrib/minizip/test/CMakeLists.txt b/contrib/minizip/test/CMakeLists.txt
index 345718c..2da5ae1 100644
--- a/contrib/minizip/test/CMakeLists.txt
+++ b/contrib/minizip/test/CMakeLists.txt
@@ -1,26 +1,39 @@
1add_test(NAME minizip_test_install 1#if we are built from with zlib, use this path's)
2 COMMAND ${CMAKE_COMMAND} --install ${zlib_BINARY_DIR} 2if(DEFINED ZLIB_BUILD_SHARED)
3 --prefix ${CMAKE_CURRENT_BINARY_DIR}/test_install 3 set(WORK_DIR ${zlib_BINARY_DIR})
4 --config $<CONFIG> 4 set(inst_setup minizip_minizip_install)
5 WORKING_DIRECTORY ${zlib_BINARY_DIR}) 5else(DEFINED ZLIB_BUILD_SHARED)
6 6 set(WORK_DIR ${minizip_BINARY_DIR})
7set_tests_properties(minizip_test_install 7 set(inst_setup minizip_minizip_install)
8 PROPERTIES 8 set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}")
9 FIXTURES_SETUP minizip_install) 9
10 add_test(NAME minizip_install
11 COMMAND ${CMAKE_COMMAND} --install ${minizip_BINARY_DIR}
12 --prefix ${CMAKE_CURRENT_BINARY_DIR}/test_install
13 --config $<CONFIG>
14 WORKING_DIRECTORY ${minizip_BINARY_DIR})
15
16 set_tests_properties(minizip_install
17 PROPERTIES
18 FIXTURES_SETUP minizip_install)
19endif(DEFINED ZLIB_BUILD_SHARED)
10 20
11file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) 21file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
12file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_test) 22file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)
13file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test) 23file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test)
14 24
15configure_file(${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in 25configure_file(${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in
16 ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test/CMakeLists.txt) 26 ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test/CMakeLists.txt
27 @ONLY)
17 28
18configure_file( 29configure_file(
19 ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in 30 ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in
20 ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_test/CMakeLists.txt) 31 ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test/CMakeLists.txt
32 @ONLY)
21 33
22configure_file(${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in 34configure_file(${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
23 ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt) 35 ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt
36 @ONLY)
24 37
25# CMAKE_GENERATOR_PLATFORM doesn't work in the if 38# CMAKE_GENERATOR_PLATFORM doesn't work in the if
26set(GENERATOR ${CMAKE_GENERATOR_PLATFORM}) 39set(GENERATOR ${CMAKE_GENERATOR_PLATFORM})
@@ -32,108 +45,83 @@ endif(GENERATOR)
32# 45#
33# findpackage_test 46# findpackage_test
34# 47#
35add_test(NAME minizip_configure_find_package 48add_test(NAME minizip_find_package_configure
36 COMMAND ${CMAKE_COMMAND} 49 COMMAND ${CMAKE_COMMAND}
37 ${PLATFORM} 50 ${PLATFORM}
38 -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build 51 -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build
39 -DCMAKE_BUILD_TYPE=$<CONFIG> 52 -DCMAKE_BUILD_TYPE=$<CONFIG>
40 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} 53 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
41 -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} 54 -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
42 -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install 55 -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test/test_install
43 -DZDIR=${CMAKE_CURRENT_BINARY_DIR}/test_install/${CMAKE_INSTALL_LIBDIR} 56 ${ZLIB_ARG}
44 --fresh 57 --fresh
45 -G "${CMAKE_GENERATOR}" 58 -G "${CMAKE_GENERATOR}"
46 -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) 59 -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
47 60
48add_test(NAME minizip_build_find_package 61add_test(NAME minizip_find_package_build
49 COMMAND ${CMAKE_COMMAND} --build . 62 COMMAND ${CMAKE_COMMAND} --build .
50 --config $<CONFIG> 63 --config $<CONFIG>
51 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build) 64 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build)
52 65
53add_test(NAME minizip_test_find_package 66set_tests_properties(minizip_find_package_configure PROPERTIES
54 COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> 67 FIXTURES_REQUIRED ${inst_setup}
55 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build)
56
57set_tests_properties(minizip_configure_find_package PROPERTIES
58 FIXTURES_REQUIRED minizip_install
59 FIXTURES_SETUP mzfp_config) 68 FIXTURES_SETUP mzfp_config)
60 69
61set_tests_properties(minizip_build_find_package PROPERTIES 70set_tests_properties(minizip_find_package_build PROPERTIES
62 FIXTURES_REQUIRED mzfp_config 71 FIXTURES_REQUIRED mzfp_config)
63 FIXTURES_SETUP mzfp_build)
64
65set_tests_properties(minizip_test_find_package PROPERTIES
66 FIXTURES_REQUIRED mzfp_build
67 ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1)
68 72
69# 73#
70# add_subdirectory_test 74# add_subdirectory_test
71# 75#
72add_test(NAME minizip_configure_add_subdirectory 76add_test(NAME minizip_add_subdirectory_configure
73 COMMAND ${CMAKE_COMMAND} 77 COMMAND ${CMAKE_COMMAND}
74 ${PLATFORM} 78 ${PLATFORM}
75 -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build 79 -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build
76 -DCMAKE_BUILD_TYPE=$<CONFIG> 80 -DCMAKE_BUILD_TYPE=$<CONFIG>
77 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} 81 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
78 -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} 82 -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
79 -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install 83 -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test/test_install
84 ${ZLIB_ARG}
80 --fresh 85 --fresh
81 -G "${CMAKE_GENERATOR}" 86 -G "${CMAKE_GENERATOR}"
82 -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) 87 -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)
83 88
84add_test(NAME minizip_build_add_subdirectory 89add_test(NAME minizip_add_subdirectory_build
85 COMMAND ${CMAKE_COMMAND} --build . 90 COMMAND ${CMAKE_COMMAND} --build .
86 --config $<CONFIG> 91 --config $<CONFIG>
87 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build) 92 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build)
88 93
89add_test(NAME minizip_test_add_subdirectory 94set_tests_properties(minizip_add_subdirectory_configure PROPERTIES
90 COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> 95 FIXTURES_REQUIRED ${inst_setup}
91 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build)
92
93set_tests_properties(minizip_configure_add_subdirectory PROPERTIES
94 FIXTURES_REQUIRED minizip_install
95 FIXTURES_SETUP mzas_config) 96 FIXTURES_SETUP mzas_config)
96 97
97set_tests_properties(minizip_build_add_subdirectory PROPERTIES 98set_tests_properties(minizip_add_subdirectory_build PROPERTIES
98 FIXTURES_REQUIRED mzas_config 99 FIXTURES_REQUIRED mzas_config)
99 FIXTURES_SETUP mzas_build)
100
101set_tests_properties(minizip_test_add_subdirectory PROPERTIES
102 FIXTURES_REQUIRED mzas_build
103 ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1)
104 100
105# 101#
106# add_subdirectory_exclude_test 102# add_subdirectory_exclude_test
107# 103#
108add_test(NAME minizip_configure_add_subdirectory_exclude 104add_test(NAME minizip_add_subdirectory_exclude_configure
109 COMMAND ${CMAKE_COMMAND} 105 COMMAND ${CMAKE_COMMAND}
110 ${PLATFORM} 106 ${PLATFORM}
111 -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build 107 -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build
112 -DCMAKE_BUILD_TYPE=$<CONFIG> 108 -DCMAKE_BUILD_TYPE=$<CONFIG>
113 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} 109 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
114 -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} 110 -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
115 -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install 111 -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test/test_install
112 ${ZLIB_ARG}
116 --fresh 113 --fresh
117 -G "${CMAKE_GENERATOR}" 114 -G "${CMAKE_GENERATOR}"
118 -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) 115 -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test)
119 116
120add_test(NAME minizip_build_add_subdirectory_exclude 117add_test(NAME minizip_add_subdirectory_exclude_build
121 COMMAND ${CMAKE_COMMAND} --build . 118 COMMAND ${CMAKE_COMMAND} --build .
122 --config $<CONFIG> 119 --config $<CONFIG>
123 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build) 120 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build)
124 121
125add_test(NAME minizip_test_add_subdirectory_exclude 122set_tests_properties(minizip_add_subdirectory_exclude_configure PROPERTIES
126 COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> 123 FIXTURES_REQUIRED ${inst_setup}
127 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build)
128
129set_tests_properties(minizip_configure_add_subdirectory_exclude PROPERTIES
130 FIXTURES_REQUIRED minizip_install
131 FIXTURES_SETUP mzasx_config) 124 FIXTURES_SETUP mzasx_config)
132 125
133set_tests_properties(minizip_build_add_subdirectory_exclude PROPERTIES 126set_tests_properties(minizip_add_subdirectory_exclude_build PROPERTIES
134 FIXTURES_REQUIRED mzasx_config 127 FIXTURES_REQUIRED mzasx_config)
135 FIXTURES_SETUP mzasx_build)
136
137set_tests_properties(minizip_test_add_subdirectory_exclude PROPERTIES
138 FIXTURES_REQUIRED mzasx_build
139 ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1)
diff --git a/contrib/minizip/test/add_subdirectory_exclude_test.cmake.in b/contrib/minizip/test/add_subdirectory_exclude_test.cmake.in
index 92d6a4d..277b2cd 100644
--- a/contrib/minizip/test/add_subdirectory_exclude_test.cmake.in
+++ b/contrib/minizip/test/add_subdirectory_exclude_test.cmake.in
@@ -1,25 +1,27 @@
1cmake_minimum_required(VERSION 3.12) 1cmake_minimum_required(VERSION 3.12)
2 2
3project(zlib_find_package_test 3project(minizip_add_subdirectory_exclude_from_all
4 LANGUAGES C 4 LANGUAGES C
5 VERSION ${zlib_VERSION}) 5 VERSION @minizip_VERSION@)
6 6
7enable_testing() 7option(MINIZIP_BUILD_TESTING "" OFF)
8set(ZLIB_BUILD_TESTING OFF) 8option(MINIZIP_BUILD_SHARED "" @MINIZIP_BUILD_SHARED@)
9add_subdirectory(${zlib_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/zlib EXCLUDE_FROM_ALL) 9option(MINIZIP_BUILD_STATIC "" @MINIZIP_BUILD_STATIC@)
10 10
11if(${ZLIB_BUILD_SHARED}) 11add_subdirectory(@minizip_SOURCE_DIR@ ${CMAKE_CURRENT_BINARY_DIR}/minizip EXCLUDE_FROM_ALL)
12 add_executable(test_example ${zlib_SOURCE_DIR}/test/example.c)
13 target_link_libraries(test_example ZLIB::ZLIB)
14 12
15 if(NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll") 13set(MINIZIP_SRCS
16 add_test(NAME zlib_test_example_shared COMMAND test_example) 14 @minizip_SOURCE_DIR@/ioapi.c
17 endif(NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll") 15 $<$<BOOL:${WIN32}>:@minizip_SOURCE_DIR@/iowin32.c>
18endif(${ZLIB_BUILD_SHARED}) 16 @minizip_SOURCE_DIR@/minizip.c
17 @minizip_SOURCE_DIR@/zip.c)
19 18
20if(${ZLIB_BUILD_STATIC}) 19if(MINIZIP_BUILD_SHARED)
21 add_executable(test_example_static ${zlib_SOURCE_DIR}/test/example.c) 20 add_executable(test_example ${MINIZIP_SRCS})
22 target_link_libraries(test_example_static ZLIB::ZLIBSTATIC) 21 target_link_libraries(test_example MINIZIP::minizip)
23 add_test(NAME zlib_test_example_static 22endif(MINIZIP_BUILD_SHARED)
24 COMMAND test_example_static) 23
25endif(${ZLIB_BUILD_STATIC}) 24if(MINIZIP_BUILD_STATIC)
25 add_executable(test_example_static ${MINIZIP_SRCS})
26 target_link_libraries(test_example_static MINIZIP::minizipstatic)
27endif(MINIZIP_BUILD_STATIC)
diff --git a/contrib/minizip/test/add_subdirectory_test.cmake.in b/contrib/minizip/test/add_subdirectory_test.cmake.in
index fc2a9e0..a29b415 100644
--- a/contrib/minizip/test/add_subdirectory_test.cmake.in
+++ b/contrib/minizip/test/add_subdirectory_test.cmake.in
@@ -1,25 +1,27 @@
1cmake_minimum_required(VERSION 3.12) 1cmake_minimum_required(VERSION 3.12)
2 2
3project(zlib_find_package_test 3project(minizip_add_subdirectory_exclude_from_all
4 LANGUAGES C 4 LANGUAGES C
5 VERSION ${zlib_VERSION}) 5 VERSION @minizip_VERSION@)
6 6
7enable_testing() 7option(MINIZIP_BUILD_TESTING "" OFF)
8set(ZLIB_BUILD_TESTING OFF) 8option(MINIZIP_BUILD_SHARED "" @MINIZIP_BUILD_SHARED@)
9add_subdirectory(${zlib_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/zlib) 9option(MINIZIP_BUILD_STATIC "" @MINIZIP_BUILD_STATIC@)
10 10
11if(${ZLIB_BUILD_SHARED}) 11add_subdirectory(@minizip_SOURCE_DIR@ ${CMAKE_CURRENT_BINARY_DIR}/minizip)
12 add_executable(test_example ${zlib_SOURCE_DIR}/test/example.c)
13 target_link_libraries(test_example ZLIB::ZLIB)
14 12
15 if(NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll") 13set(MINIZIP_SRCS
16 add_test(NAME zlib_test_example_shared COMMAND test_example) 14 @minizip_SOURCE_DIR@/ioapi.c
17 endif(NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll") 15 $<$<BOOL:${WIN32}>:@minizip_SOURCE_DIR@/iowin32.c>
18endif(${ZLIB_BUILD_SHARED}) 16 @minizip_SOURCE_DIR@/minizip.c
17 @minizip_SOURCE_DIR@/zip.c)
19 18
20if(${ZLIB_BUILD_STATIC}) 19if(MINIZIP_BUILD_SHARED)
21 add_executable(test_example_static ${zlib_SOURCE_DIR}/test/example.c) 20 add_executable(test_example ${MINIZIP_SRCS})
22 target_link_libraries(test_example_static ZLIB::ZLIBSTATIC) 21 target_link_libraries(test_example MINIZIP::minizip)
23 add_test(NAME zlib_test_example_static 22endif(MINIZIP_BUILD_SHARED)
24 COMMAND test_example_static) 23
25endif(${ZLIB_BUILD_STATIC}) 24if(MINIZIP_BUILD_STATIC)
25 add_executable(test_example_static ${MINIZIP_SRCS})
26 target_link_libraries(test_example_static MINIZIP::minizipstatic)
27endif(MINIZIP_BUILD_STATIC)
diff --git a/contrib/minizip/test/find_package_test.cmake.in b/contrib/minizip/test/find_package_test.cmake.in
index 3df1ede..b56b559 100644
--- a/contrib/minizip/test/find_package_test.cmake.in
+++ b/contrib/minizip/test/find_package_test.cmake.in
@@ -1,24 +1,25 @@
1cmake_minimum_required(VERSION 3.12) 1cmake_minimum_required(VERSION 3.12)
2 2
3project(zlib_find_package_test 3project(minizip_find_package
4 LANGUAGES C 4 LANGUAGES C
5 VERSION ${zlib_VERSION}) 5 VERSION @minizip_VERSION@)
6 6
7enable_testing() 7option(MINIZIP_BUILD_SHARED "" @MINIZIP_BUILD_SHARED@)
8find_package(ZLIB ${zlib_VERSION} CONFIG REQUIRED) 8option(MINIZIP_BUILD_STATIC "" @MINIZIP_BUILD_STATIC@)
9find_package(minizip ${minizip_VERSION} CONFIG REQUIRED)
9 10
10if(${ZLIB_BUILD_SHARED}) 11set(MINIZIP_SRCS
11 add_executable(test_example ${zlib_SOURCE_DIR}/test/example.c) 12 @minizip_SOURCE_DIR@/ioapi.c
12 target_link_libraries(test_example ZLIB::ZLIB) 13 $<$<BOOL:${WIN32}>:@minizip_SOURCE_DIR@/iowin32.c>
14 @minizip_SOURCE_DIR@/minizip.c
15 @minizip_SOURCE_DIR@/zip.c)
13 16
14 if(NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll") 17if(MINIZIP_BUILD_SHARED)
15 add_test(NAME zlib_test_example_shared COMMAND test_example) 18 add_executable(test_example ${MINIZIP_SRCS})
16 endif(NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll") 19 target_link_libraries(test_example MINIZIP::minizip)
17endif(${ZLIB_BUILD_SHARED}) 20endif(MINIZIP_BUILD_SHARED)
18 21
19if(${ZLIB_BUILD_STATIC}) 22if(MINIZIP_BUILD_STATIC)
20 add_executable(test_example_static ${zlib_SOURCE_DIR}/test/example.c) 23 add_executable(test_example_static ${MINIZIP_SRCS})
21 target_link_libraries(test_example_static ZLIB::ZLIBSTATIC) 24 target_link_libraries(test_example_static MINIZIP::minizipstatic)
22 add_test(NAME zlib_test_example_static 25endif(MINIZIP_BUILD_STATIC)
23 COMMAND test_example_static)
24endif(${ZLIB_BUILD_STATIC})
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1f399f4..b03d23e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -121,18 +121,21 @@ set_tests_properties(zlib_install
121 FIXTURES_SETUP zlib_install) 121 FIXTURES_SETUP zlib_install)
122 122
123file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) 123file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
124file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_test) 124file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)
125file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test) 125file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test)
126 126
127configure_file(${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in 127configure_file(${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in
128 ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test/CMakeLists.txt) 128 ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test/CMakeLists.txt
129 @ONLY)
129 130
130configure_file( 131configure_file(
131 ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in 132 ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in
132 ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_test/CMakeLists.txt) 133 ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test/CMakeLists.txt
134 @ONLY)
133 135
134configure_file(${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in 136configure_file(${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
135 ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt) 137 ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt
138 @ONLY)
136 139
137# CMAKE_GENERATOR_PLATFORM doesn't work in the if 140# CMAKE_GENERATOR_PLATFORM doesn't work in the if
138set(GENERATOR ${CMAKE_GENERATOR_PLATFORM}) 141set(GENERATOR ${CMAKE_GENERATOR_PLATFORM})
@@ -143,7 +146,7 @@ endif(GENERATOR)
143# 146#
144# findpackage_test 147# findpackage_test
145# 148#
146add_test(NAME zlib_configure_find_package 149add_test(NAME zlib_find_package_configure
147 COMMAND ${CMAKE_COMMAND} 150 COMMAND ${CMAKE_COMMAND}
148 ${PLATFORM} 151 ${PLATFORM}
149 -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build 152 -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build
@@ -151,36 +154,35 @@ add_test(NAME zlib_configure_find_package
151 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} 154 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
152 -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} 155 -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
153 -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install 156 -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
154 -DZDIR=${CMAKE_CURRENT_BINARY_DIR}/test_install/${CMAKE_INSTALL_LIBDIR}
155 --fresh 157 --fresh
156 -G "${CMAKE_GENERATOR}" 158 -G "${CMAKE_GENERATOR}"
157 -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) 159 -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
158 160
159add_test(NAME zlib_build_find_package 161add_test(NAME zlib_find_package_build
160 COMMAND ${CMAKE_COMMAND} --build . 162 COMMAND ${CMAKE_COMMAND} --build .
161 --config $<CONFIG> 163 --config $<CONFIG>
162 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build) 164 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build)
163 165
164add_test(NAME zlib_test_find_package 166add_test(NAME zlib_find_package_test
165 COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> 167 COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>
166 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build) 168 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build)
167 169
168set_tests_properties(zlib_configure_find_package PROPERTIES 170set_tests_properties(zlib_find_package_configure PROPERTIES
169 FIXTURES_REQUIRED zlib_install 171 FIXTURES_REQUIRED zlib_install
170 FIXTURES_SETUP fp_config) 172 FIXTURES_SETUP fp_config)
171 173
172set_tests_properties(zlib_build_find_package PROPERTIES 174set_tests_properties(zlib_find_package_build PROPERTIES
173 FIXTURES_REQUIRED fp_config 175 FIXTURES_REQUIRED fp_config
174 FIXTURES_SETUP fp_build) 176 FIXTURES_SETUP fp_build)
175 177
176set_tests_properties(zlib_test_find_package PROPERTIES 178set_tests_properties(zlib_find_package_test PROPERTIES
177 FIXTURES_REQUIRED fp_build 179 FIXTURES_REQUIRED fp_build
178 ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1) 180 ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1)
179 181
180# 182#
181# add_subdirectory_test 183# add_subdirectory_test
182# 184#
183add_test(NAME zlib_configure_add_subdirectory 185add_test(NAME zlib_add_subdirectory_configure
184 COMMAND ${CMAKE_COMMAND} 186 COMMAND ${CMAKE_COMMAND}
185 ${PLATFORM} 187 ${PLATFORM}
186 -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build 188 -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build
@@ -192,31 +194,31 @@ add_test(NAME zlib_configure_add_subdirectory
192 -G "${CMAKE_GENERATOR}" 194 -G "${CMAKE_GENERATOR}"
193 -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) 195 -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
194 196
195add_test(NAME zlib_build_add_subdirectory 197add_test(NAME zlib_add_subdirectory_build
196 COMMAND ${CMAKE_COMMAND} --build . 198 COMMAND ${CMAKE_COMMAND} --build .
197 --config $<CONFIG> 199 --config $<CONFIG>
198 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build) 200 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build)
199 201
200add_test(NAME zlib_test_add_subdirectory 202add_test(NAME zlib_add_subdirectory_test
201 COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> 203 COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>
202 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build) 204 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build)
203 205
204set_tests_properties(zlib_configure_add_subdirectory PROPERTIES 206set_tests_properties(zlib_add_subdirectory_configure PROPERTIES
205 FIXTURES_REQUIRED zlib_install 207 FIXTURES_REQUIRED zlib_install
206 FIXTURES_SETUP as_config) 208 FIXTURES_SETUP as_config)
207 209
208set_tests_properties(zlib_build_add_subdirectory PROPERTIES 210set_tests_properties(zlib_add_subdirectory_build PROPERTIES
209 FIXTURES_REQUIRED as_config 211 FIXTURES_REQUIRED as_config
210 FIXTURES_SETUP as_build) 212 FIXTURES_SETUP as_build)
211 213
212set_tests_properties(zlib_test_add_subdirectory PROPERTIES 214set_tests_properties(zlib_add_subdirectory_test PROPERTIES
213 FIXTURES_REQUIRED as_build 215 FIXTURES_REQUIRED as_build
214 ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1) 216 ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1)
215 217
216# 218#
217# add_subdirectory_exclude_test 219# add_subdirectory_exclude_test
218# 220#
219add_test(NAME zlib_configure_add_subdirectory_exclude 221add_test(NAME zlib_add_subdirectory_exclude_configure
220 COMMAND ${CMAKE_COMMAND} 222 COMMAND ${CMAKE_COMMAND}
221 ${PLATFORM} 223 ${PLATFORM}
222 -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build 224 -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build
@@ -228,23 +230,23 @@ add_test(NAME zlib_configure_add_subdirectory_exclude
228 -G "${CMAKE_GENERATOR}" 230 -G "${CMAKE_GENERATOR}"
229 -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) 231 -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
230 232
231add_test(NAME zlib_build_add_subdirectory_exclude 233add_test(NAME zlib_add_subdirectory_exclude_build
232 COMMAND ${CMAKE_COMMAND} --build . 234 COMMAND ${CMAKE_COMMAND} --build .
233 --config $<CONFIG> 235 --config $<CONFIG>
234 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build) 236 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build)
235 237
236add_test(NAME zlib_test_add_subdirectory_exclude 238add_test(NAME zlib_add_subdirectory_exclude_test
237 COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> 239 COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>
238 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build) 240 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build)
239 241
240set_tests_properties(zlib_configure_add_subdirectory_exclude PROPERTIES 242set_tests_properties(zlib_add_subdirectory_exclude_configure PROPERTIES
241 FIXTURES_REQUIRED zlib_install 243 FIXTURES_REQUIRED zlib_install
242 FIXTURES_SETUP asx_config) 244 FIXTURES_SETUP asx_config)
243 245
244set_tests_properties(zlib_build_add_subdirectory_exclude PROPERTIES 246set_tests_properties(zlib_add_subdirectory_exclude_build PROPERTIES
245 FIXTURES_REQUIRED as_config 247 FIXTURES_REQUIRED as_config
246 FIXTURES_SETUP asx_build) 248 FIXTURES_SETUP asx_build)
247 249
248set_tests_properties(zlib_test_add_subdirectory_exclude PROPERTIES 250set_tests_properties(zlib_add_subdirectory_exclude_test PROPERTIES
249 FIXTURES_REQUIRED asx_build 251 FIXTURES_REQUIRED asx_build
250 ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1) 252 ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1)
diff --git a/test/add_subdirectory_exclude_test.cmake.in b/test/add_subdirectory_exclude_test.cmake.in
index 9516546..c751a7a 100644
--- a/test/add_subdirectory_exclude_test.cmake.in
+++ b/test/add_subdirectory_exclude_test.cmake.in
@@ -2,24 +2,27 @@ cmake_minimum_required(VERSION 3.10)
2 2
3project(zlib_find_package_test 3project(zlib_find_package_test
4 LANGUAGES C 4 LANGUAGES C
5 VERSION ${zlib_VERSION}) 5 VERSION @zlib_VERSION@)
6 6
7enable_testing() 7enable_testing()
8set(ZLIB_BUILD_TESTING OFF) 8option(ZLIB_BUILD_TESTING "" OFF)
9add_subdirectory(${zlib_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/zlib EXCLUDE_FROM_ALL) 9option(ZLIB_BUILD_SHARED "" @ZLIB_BUILD_SHARED@)
10option(ZLIB_BUILD_STATIC "" @ZLIB_BUILD_STATIC@)
10 11
11if(${ZLIB_BUILD_SHARED}) 12add_subdirectory(@zlib_SOURCE_DIR@ ${CMAKE_CURRENT_BINARY_DIR}/zlib EXCLUDE_FROM_ALL)
12 add_executable(test_example ${zlib_SOURCE_DIR}/test/example.c) 13
14if(ZLIB_BUILD_SHARED)
15 add_executable(test_example @zlib_SOURCE_DIR@/test/example.c)
13 target_link_libraries(test_example ZLIB::ZLIB) 16 target_link_libraries(test_example ZLIB::ZLIB)
14 17
15 if(NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll") 18 if(NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll")
16 add_test(NAME zlib_test_example_shared COMMAND test_example) 19 add_test(NAME zlib_test_example_shared COMMAND test_example)
17 endif(NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll") 20 endif(NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll")
18endif(${ZLIB_BUILD_SHARED}) 21endif(ZLIB_BUILD_SHARED)
19 22
20if(${ZLIB_BUILD_STATIC}) 23if(ZLIB_BUILD_STATIC)
21 add_executable(test_example_static ${zlib_SOURCE_DIR}/test/example.c) 24 add_executable(test_example_static @zlib_SOURCE_DIR@/test/example.c)
22 target_link_libraries(test_example_static ZLIB::ZLIBSTATIC) 25 target_link_libraries(test_example_static ZLIB::ZLIBSTATIC)
23 add_test(NAME zlib_test_example_static 26 add_test(NAME zlib_test_example_static
24 COMMAND test_example_static) 27 COMMAND test_example_static)
25endif(${ZLIB_BUILD_STATIC}) 28endif(ZLIB_BUILD_STATIC)
diff --git a/test/add_subdirectory_test.cmake.in b/test/add_subdirectory_test.cmake.in
index 72933ba..d5e3a05 100644
--- a/test/add_subdirectory_test.cmake.in
+++ b/test/add_subdirectory_test.cmake.in
@@ -2,24 +2,27 @@ cmake_minimum_required(VERSION 3.10)
2 2
3project(zlib_find_package_test 3project(zlib_find_package_test
4 LANGUAGES C 4 LANGUAGES C
5 VERSION ${zlib_VERSION}) 5 VERSION @zlib_VERSION@)
6 6
7enable_testing() 7enable_testing()
8set(ZLIB_BUILD_TESTING OFF) 8option(ZLIB_BUILD_TESTING "" OFF)
9add_subdirectory(${zlib_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/zlib) 9option(ZLIB_BUILD_SHARED "" @ZLIB_BUILD_SHARED@)
10option(ZLIB_BUILD_STATIC "" @ZLIB_BUILD_STATIC@)
10 11
11if(${ZLIB_BUILD_SHARED}) 12add_subdirectory(@zlib_SOURCE_DIR@ ${CMAKE_CURRENT_BINARY_DIR}/zlib)
12 add_executable(test_example ${zlib_SOURCE_DIR}/test/example.c) 13
14if(ZLIB_BUILD_SHARED)
15 add_executable(test_example @zlib_SOURCE_DIR@/test/example.c)
13 target_link_libraries(test_example ZLIB::ZLIB) 16 target_link_libraries(test_example ZLIB::ZLIB)
14 17
15 if(NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll") 18 if(NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll")
16 add_test(NAME zlib_test_example_shared COMMAND test_example) 19 add_test(NAME zlib_test_example_shared COMMAND test_example)
17 endif(NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll") 20 endif(NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll")
18endif(${ZLIB_BUILD_SHARED}) 21endif(ZLIB_BUILD_SHARED)
19 22
20if(${ZLIB_BUILD_STATIC}) 23if(ZLIB_BUILD_STATIC)
21 add_executable(test_example_static ${zlib_SOURCE_DIR}/test/example.c) 24 add_executable(test_example_static @zlib_SOURCE_DIR@/test/example.c)
22 target_link_libraries(test_example_static ZLIB::ZLIBSTATIC) 25 target_link_libraries(test_example_static ZLIB::ZLIBSTATIC)
23 add_test(NAME zlib_test_example_static 26 add_test(NAME zlib_test_example_static
24 COMMAND test_example_static) 27 COMMAND test_example_static)
25endif(${ZLIB_BUILD_STATIC}) 28endif(@ZLIB_BUILD_STATIC)
diff --git a/test/find_package_test.cmake.in b/test/find_package_test.cmake.in
index 2adab4c..728a1a4 100644
--- a/test/find_package_test.cmake.in
+++ b/test/find_package_test.cmake.in
@@ -2,23 +2,25 @@ cmake_minimum_required(VERSION 3.10)
2 2
3project(zlib_find_package_test 3project(zlib_find_package_test
4 LANGUAGES C 4 LANGUAGES C
5 VERSION ${zlib_VERSION}) 5 VERSION @zlib_VERSION@)
6 6
7enable_testing() 7enable_testing()
8find_package(ZLIB ${zlib_VERSION} CONFIG REQUIRED) 8find_package(ZLIB @zlib_VERSION@ CONFIG REQUIRED)
9option(ZLIB_BUILD_SHARED "" @ZLIB_BUILD_SHARED@)
10option(ZLIB_BUILD_STATIC "" @ZLIB_BUILD_STATIC@)
9 11
10if(${ZLIB_BUILD_SHARED}) 12if(ZLIB_BUILD_SHARED)
11 add_executable(test_example ${zlib_SOURCE_DIR}/test/example.c) 13 add_executable(test_example @zlib_SOURCE_DIR@/test/example.c)
12 target_link_libraries(test_example ZLIB::ZLIB) 14 target_link_libraries(test_example ZLIB::ZLIB)
13 15
14 if(NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll") 16 if(NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll")
15 add_test(NAME zlib_test_example_shared COMMAND test_example) 17 add_test(NAME zlib_test_example_shared COMMAND test_example)
16 endif(NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll") 18 endif(NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll")
17endif(${ZLIB_BUILD_SHARED}) 19endif(ZLIB_BUILD_SHARED)
18 20
19if(${ZLIB_BUILD_STATIC}) 21if(ZLIB_BUILD_STATIC)
20 add_executable(test_example_static ${zlib_SOURCE_DIR}/test/example.c) 22 add_executable(test_example_static @zlib_SOURCE_DIR@/test/example.c)
21 target_link_libraries(test_example_static ZLIB::ZLIBSTATIC) 23 target_link_libraries(test_example_static ZLIB::ZLIBSTATIC)
22 add_test(NAME zlib_test_example_static 24 add_test(NAME zlib_test_example_static
23 COMMAND test_example_static) 25 COMMAND test_example_static)
24endif(${ZLIB_BUILD_STATIC}) 26endif(ZLIB_BUILD_STATIC)
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-15 17:29:25 +0000