diff options
author | Vollstrecker <werner@vollstreckernet.de> | 2025-01-03 09:50:16 +0100 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2025-01-31 20:02:26 -0800 |
commit | 8b8a124eb42b027dceab01c7d4942a18c756d28e (patch) | |
tree | bc8d9427d1689be996af87276e3a6d3371cae267 /test | |
parent | 4f2671d50cf0f8632c9f6e84b884aba5031e4016 (diff) | |
download | zlib-8b8a124eb42b027dceab01c7d4942a18c756d28e.tar.gz zlib-8b8a124eb42b027dceab01c7d4942a18c756d28e.tar.bz2 zlib-8b8a124eb42b027dceab01c7d4942a18c756d28e.zip |
CMake: Add cmake-format.yaml and reformat the cmake files.
Diffstat (limited to 'test')
-rw-r--r-- | test/CMakeLists.txt | 306 | ||||
-rw-r--r-- | test/add_subdirectory_exclude_test.cmake.in | 9 | ||||
-rw-r--r-- | test/add_subdirectory_test.cmake.in | 6 | ||||
-rw-r--r-- | test/find_package_test.cmake.in | 6 |
4 files changed, 169 insertions, 158 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index b9bcdfa..46c07eb 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt | |||
@@ -1,68 +1,78 @@ | |||
1 | function (ZLIB_findTestEnv testName) | 1 | function(ZLIB_findTestEnv testName) |
2 | set (testEnv "PATH=") | 2 | set(testEnv "PATH=") |
3 | 3 | ||
4 | if (MSVC OR MINGW) | 4 | if(MSVC OR MINGW) |
5 | set (separator "\\\;") | 5 | set(separator "\\\;") |
6 | else() | 6 | else() |
7 | set (separator ":") | 7 | set(separator ":") |
8 | endif() | 8 | endif() |
9 | 9 | ||
10 | string (APPEND testEnv "$<TARGET_FILE_DIR:ZLIB::ZLIB>${separator}") | 10 | string(APPEND testEnv "$<TARGET_FILE_DIR:ZLIB::ZLIB>${separator}") |
11 | string (APPEND testEnv "$ENV{PATH}") | 11 | string(APPEND testEnv "$ENV{PATH}") |
12 | 12 | ||
13 | set_tests_properties (${testName} PROPERTIES | 13 | set_tests_properties(${testName} PROPERTIES ENVIRONMENT "${testEnv}") |
14 | ENVIRONMENT "${testEnv}" | ||
15 | ) | ||
16 | endfunction() | 14 | endfunction() |
17 | 15 | ||
18 | if(ZLIB_BUILD_SHARED) | 16 | if(ZLIB_BUILD_SHARED) |
19 | add_executable(zlib_example example.c) | 17 | add_executable(zlib_example example.c) |
20 | target_link_libraries(zlib_example ZLIB::ZLIB) | 18 | target_link_libraries(zlib_example ZLIB::ZLIB) |
21 | add_test(NAME zlib_example | 19 | add_test(NAME zlib_example COMMAND zlib_example) |
22 | COMMAND zlib_example) | ||
23 | 20 | ||
24 | add_executable(minigzip minigzip.c) | 21 | add_executable(minigzip minigzip.c) |
25 | target_compile_definitions(minigzip | 22 | target_compile_definitions( |
26 | PRIVATE | 23 | minigzip PRIVATE $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>) |
27 | $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>) | ||
28 | target_link_libraries(minigzip ZLIB::ZLIB) | 24 | target_link_libraries(minigzip ZLIB::ZLIB) |
29 | 25 | ||
30 | if (MSVC OR MSYS OR MINGW OR CYGWIN) | 26 | if(MSVC |
31 | ZLIB_findTestEnv (zlib_example) | 27 | OR MSYS |
32 | endif (MSVC OR MSYS OR MINGW OR CYGWIN) | 28 | OR MINGW |
29 | OR CYGWIN) | ||
30 | zlib_findtestenv(zlib_example) | ||
31 | endif( | ||
32 | MSVC | ||
33 | OR MSYS | ||
34 | OR MINGW | ||
35 | OR CYGWIN) | ||
33 | 36 | ||
34 | if(HAVE_OFF64_T) | 37 | if(HAVE_OFF64_T) |
35 | add_executable(zlib_example64 example.c) | 38 | add_executable(zlib_example64 example.c) |
36 | target_compile_definitions(zlib_example64 | 39 | target_compile_definitions( |
37 | PRIVATE | 40 | zlib_example64 |
38 | LARGEFILE64_SOURCE=1 | 41 | PRIVATE LARGEFILE64_SOURCE=1 |
39 | $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>) | 42 | $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>) |
40 | target_link_libraries(zlib_example64 ZLIB::ZLIB) | 43 | target_link_libraries(zlib_example64 ZLIB::ZLIB) |
41 | add_test(NAME zlib_example64 | 44 | add_test(NAME zlib_example64 COMMAND zlib_example64) |
42 | COMMAND zlib_example64) | 45 | |
43 | 46 | if(MSVC | |
44 | if (MSVC OR MSYS OR MINGW OR CYGWIN) | 47 | OR MSYS |
45 | ZLIB_findTestEnv (zlib_example64) | 48 | OR MINGW |
46 | endif (MSVC OR MSYS OR MINGW OR CYGWIN) | 49 | OR CYGWIN) |
50 | zlib_findtestenv(zlib_example64) | ||
51 | endif( | ||
52 | MSVC | ||
53 | OR MSYS | ||
54 | OR MINGW | ||
55 | OR CYGWIN) | ||
47 | endif(HAVE_OFF64_T) | 56 | endif(HAVE_OFF64_T) |
48 | endif(ZLIB_BUILD_SHARED) | 57 | endif(ZLIB_BUILD_SHARED) |
49 | 58 | ||
50 | if(ZLIB_BUILD_STATIC) | 59 | if(ZLIB_BUILD_STATIC) |
51 | add_executable(zlib_static_example example.c) | 60 | add_executable(zlib_static_example example.c) |
52 | target_link_libraries(zlib_static_example ZLIB::ZLIBSTATIC) | 61 | target_link_libraries(zlib_static_example ZLIB::ZLIBSTATIC) |
53 | target_compile_definitions(zlib_static_example | 62 | target_compile_definitions( |
54 | PRIVATE | 63 | zlib_static_example |
55 | $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>) | 64 | PRIVATE $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>) |
56 | add_test(NAME zlib_static_example | 65 | add_test(NAME zlib_static_example COMMAND zlib_static_example) |
57 | COMMAND zlib_static_example) | ||
58 | 66 | ||
59 | add_executable(static_minigzip minigzip.c) | 67 | add_executable(static_minigzip minigzip.c) |
60 | target_link_libraries(static_minigzip ZLIB::ZLIBSTATIC) | 68 | target_link_libraries(static_minigzip ZLIB::ZLIBSTATIC) |
61 | 69 | ||
62 | if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR | 70 | if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_C_COMPILER_ID} STREQUAL |
63 | ${CMAKE_C_COMPILER_ID} STREQUAL "Clang") | 71 | "Clang") |
64 | set(CFLAGS_OLD ${CMAKE_C_FLAGS}) | 72 | set(CFLAGS_OLD ${CMAKE_C_FLAGS}) |
65 | set({CMAKE_C_FLAGS "" CACHE STRING "" FORCE) | 73 | set({CMAKE_C_FLAGS |
74 | "" | ||
75 | CACHE STRING "" FORCE) | ||
66 | 76 | ||
67 | if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU") | 77 | if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU") |
68 | find_program(GCOV_EXECUTABLE gcov) | 78 | find_program(GCOV_EXECUTABLE gcov) |
@@ -73,7 +83,7 @@ if(ZLIB_BUILD_STATIC) | |||
73 | list(APPEND llvm_names llvm-cov) | 83 | list(APPEND llvm_names llvm-cov) |
74 | 84 | ||
75 | foreach(ver RANGE 11 99) | 85 | foreach(ver RANGE 11 99) |
76 | list(APPEND llvm_names llvm-cov-${ver}) | 86 | list(APPEND llvm_names llvm-cov-${ver}) |
77 | endforeach(ver RANGE 11 99) | 87 | endforeach(ver RANGE 11 99) |
78 | 88 | ||
79 | find_program(GCOV_EXECUTABLE NAMES ${llvm_names}) | 89 | find_program(GCOV_EXECUTABLE NAMES ${llvm_names}) |
@@ -84,57 +94,57 @@ if(ZLIB_BUILD_STATIC) | |||
84 | target_link_libraries(infcover ZLIB::ZLIBSTATIC) | 94 | target_link_libraries(infcover ZLIB::ZLIBSTATIC) |
85 | target_compile_options(infcover PRIVATE -coverage) | 95 | target_compile_options(infcover PRIVATE -coverage) |
86 | target_link_options(infcover PRIVATE -coverage) | 96 | target_link_options(infcover PRIVATE -coverage) |
87 | target_compile_definitions(infcover | 97 | target_compile_definitions( |
88 | PRIVATE | 98 | infcover PRIVATE $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>) |
89 | $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>) | 99 | add_test(NAME zlib-coverage COMMAND infcover) |
90 | add_test (NAME zlib-coverage COMMAND infcover) | 100 | set(INFCOVER_DIR ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/infcover.dir) |
91 | set (INFCOVER_DIR | 101 | add_test( |
92 | ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/infcover.dir) | 102 | NAME zlib-coverage-summary |
93 | add_test (NAME zlib-coverage-summary | 103 | COMMAND |
94 | COMMAND ${GCOV_EXECUTABLE} ${llvm_option} | 104 | ${GCOV_EXECUTABLE} ${llvm_option} |
95 | ${CMAKE_CURRENT_SOURCE_DIR}/infcover.c | 105 | ${CMAKE_CURRENT_SOURCE_DIR}/infcover.c -o |
96 | -o ${INFCOVER_DIR}/infcover.c.gcda) | 106 | ${INFCOVER_DIR}/infcover.c.gcda) |
97 | set_tests_properties(zlib-coverage-summary PROPERTIES DEPENDS zlib-coverage) | 107 | set_tests_properties(zlib-coverage-summary PROPERTIES DEPENDS |
98 | set({CMAKE_C_FLAGS ${CFLAGS_OLD} CACHE STRING "" FORCE) | 108 | zlib-coverage) |
99 | endif(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR | 109 | set({CMAKE_C_FLAGS |
100 | ${CMAKE_C_COMPILER_ID} STREQUAL "Clang") | 110 | ${CFLAGS_OLD} |
111 | CACHE STRING "" FORCE) | ||
112 | endif(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_C_COMPILER_ID} | ||
113 | STREQUAL "Clang") | ||
101 | 114 | ||
102 | if(HAVE_OFF64_T) | 115 | if(HAVE_OFF64_T) |
103 | add_executable(zlib_static_example64 example.c) | 116 | add_executable(zlib_static_example64 example.c) |
104 | target_compile_definitions(zlib_static_example64 | 117 | target_compile_definitions( |
105 | PRIVATE | 118 | zlib_static_example64 |
106 | LARGEFILE64_SOURCE=1 | 119 | PRIVATE LARGEFILE64_SOURCE=1 |
107 | $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>) | 120 | $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>) |
108 | target_link_libraries(zlib_static_example64 ZLIB::ZLIBSTATIC) | 121 | target_link_libraries(zlib_static_example64 ZLIB::ZLIBSTATIC) |
109 | add_test(NAME zlib_static_example64 | 122 | add_test(NAME zlib_static_example64 COMMAND zlib_static_example64) |
110 | COMMAND zlib_static_example64) | ||
111 | endif(HAVE_OFF64_T) | 123 | endif(HAVE_OFF64_T) |
112 | endif(ZLIB_BUILD_STATIC) | 124 | endif(ZLIB_BUILD_STATIC) |
113 | 125 | ||
114 | add_test(NAME zlib_install | 126 | add_test( |
115 | COMMAND ${CMAKE_COMMAND} --install ${zlib_BINARY_DIR} | 127 | NAME zlib_install |
116 | --prefix ${CMAKE_CURRENT_BINARY_DIR}/test_install | 128 | COMMAND ${CMAKE_COMMAND} --install ${zlib_BINARY_DIR} --prefix |
117 | --config $<CONFIG> | 129 | ${CMAKE_CURRENT_BINARY_DIR}/test_install --config $<CONFIG> |
118 | WORKING_DIRECTORY ${zlib_BINARY_DIR}) | 130 | WORKING_DIRECTORY ${zlib_BINARY_DIR}) |
119 | 131 | ||
120 | set_tests_properties(zlib_install | 132 | set_tests_properties(zlib_install PROPERTIES FIXTURES_SETUP zlib_install) |
121 | PROPERTIES | ||
122 | FIXTURES_SETUP zlib_install) | ||
123 | 133 | ||
124 | file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) | 134 | file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) |
125 | file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test) | 135 | file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test) |
126 | file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test) | 136 | file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test) |
127 | 137 | ||
128 | configure_file(${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in | 138 | configure_file( |
129 | ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test/CMakeLists.txt | 139 | ${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in |
130 | @ONLY) | 140 | ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test/CMakeLists.txt @ONLY) |
131 | 141 | ||
132 | configure_file( | 142 | configure_file( |
133 | ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in | 143 | ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in |
134 | ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test/CMakeLists.txt | 144 | ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test/CMakeLists.txt @ONLY) |
135 | @ONLY) | ||
136 | 145 | ||
137 | configure_file(${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in | 146 | configure_file( |
147 | ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in | ||
138 | ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt | 148 | ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt |
139 | @ONLY) | 149 | @ONLY) |
140 | 150 | ||
@@ -147,107 +157,107 @@ endif(GENERATOR) | |||
147 | # | 157 | # |
148 | # findpackage_test | 158 | # findpackage_test |
149 | # | 159 | # |
150 | add_test(NAME zlib_find_package_configure | 160 | add_test( |
151 | COMMAND ${CMAKE_COMMAND} | 161 | NAME zlib_find_package_configure |
152 | ${PLATFORM} | 162 | COMMAND |
163 | ${CMAKE_COMMAND} ${PLATFORM} | ||
153 | -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build | 164 | -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build |
154 | -DCMAKE_BUILD_TYPE=$<CONFIG> | 165 | -DCMAKE_BUILD_TYPE=$<CONFIG> -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} |
155 | -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} | ||
156 | -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} | 166 | -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} |
157 | -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install | 167 | -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install --fresh |
158 | --fresh | 168 | -G "${CMAKE_GENERATOR}" -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) |
159 | -G "${CMAKE_GENERATOR}" | 169 | |
160 | -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) | 170 | add_test( |
161 | 171 | NAME zlib_find_package_build | |
162 | add_test(NAME zlib_find_package_build | 172 | COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG> |
163 | COMMAND ${CMAKE_COMMAND} --build . | ||
164 | --config $<CONFIG> | ||
165 | WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build) | 173 | WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build) |
166 | 174 | ||
167 | add_test(NAME zlib_find_package_test | 175 | add_test( |
176 | NAME zlib_find_package_test | ||
168 | COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> | 177 | COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> |
169 | WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build) | 178 | WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build) |
170 | 179 | ||
171 | set_tests_properties(zlib_find_package_configure PROPERTIES | 180 | set_tests_properties( |
172 | FIXTURES_REQUIRED zlib_install | 181 | zlib_find_package_configure PROPERTIES FIXTURES_REQUIRED zlib_install |
173 | FIXTURES_SETUP fp_config) | 182 | FIXTURES_SETUP fp_config) |
174 | 183 | ||
175 | set_tests_properties(zlib_find_package_build PROPERTIES | 184 | set_tests_properties( |
176 | FIXTURES_REQUIRED fp_config | 185 | zlib_find_package_build PROPERTIES FIXTURES_REQUIRED fp_config |
177 | FIXTURES_SETUP fp_build) | 186 | FIXTURES_SETUP fp_build) |
178 | 187 | ||
179 | set_tests_properties(zlib_find_package_test PROPERTIES | 188 | set_tests_properties( |
180 | FIXTURES_REQUIRED fp_build | 189 | zlib_find_package_test PROPERTIES FIXTURES_REQUIRED fp_build ENVIRONMENT |
181 | ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1) | 190 | CTEST_OUTPUT_ON_FAILURE=1) |
182 | 191 | ||
183 | # | 192 | # |
184 | # add_subdirectory_test | 193 | # add_subdirectory_test |
185 | # | 194 | # |
186 | add_test(NAME zlib_add_subdirectory_configure | 195 | add_test( |
187 | COMMAND ${CMAKE_COMMAND} | 196 | NAME zlib_add_subdirectory_configure |
188 | ${PLATFORM} | 197 | COMMAND |
189 | -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build | 198 | ${CMAKE_COMMAND} ${PLATFORM} |
190 | -DCMAKE_BUILD_TYPE=$<CONFIG> | 199 | -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build |
191 | -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} | 200 | -DCMAKE_BUILD_TYPE=$<CONFIG> -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} |
192 | -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} | 201 | -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} |
193 | -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install | 202 | -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install --fresh |
194 | --fresh | 203 | -G "${CMAKE_GENERATOR}" -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) |
195 | -G "${CMAKE_GENERATOR}" | 204 | |
196 | -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) | 205 | add_test( |
197 | 206 | NAME zlib_add_subdirectory_build | |
198 | add_test(NAME zlib_add_subdirectory_build | 207 | COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG> |
199 | COMMAND ${CMAKE_COMMAND} --build . | ||
200 | --config $<CONFIG> | ||
201 | WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build) | 208 | WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build) |
202 | 209 | ||
203 | add_test(NAME zlib_add_subdirectory_test | 210 | add_test( |
211 | NAME zlib_add_subdirectory_test | ||
204 | COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> | 212 | COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> |
205 | WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build) | 213 | WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build) |
206 | 214 | ||
207 | set_tests_properties(zlib_add_subdirectory_configure PROPERTIES | 215 | set_tests_properties( |
208 | FIXTURES_REQUIRED zlib_install | 216 | zlib_add_subdirectory_configure PROPERTIES FIXTURES_REQUIRED zlib_install |
209 | FIXTURES_SETUP as_config) | 217 | FIXTURES_SETUP as_config) |
210 | 218 | ||
211 | set_tests_properties(zlib_add_subdirectory_build PROPERTIES | 219 | set_tests_properties( |
212 | FIXTURES_REQUIRED as_config | 220 | zlib_add_subdirectory_build PROPERTIES FIXTURES_REQUIRED as_config |
213 | FIXTURES_SETUP as_build) | 221 | FIXTURES_SETUP as_build) |
214 | 222 | ||
215 | set_tests_properties(zlib_add_subdirectory_test PROPERTIES | 223 | set_tests_properties( |
216 | FIXTURES_REQUIRED as_build | 224 | zlib_add_subdirectory_test PROPERTIES FIXTURES_REQUIRED as_build |
217 | ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1) | 225 | ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1) |
218 | 226 | ||
219 | # | 227 | # |
220 | # add_subdirectory_exclude_test | 228 | # add_subdirectory_exclude_test |
221 | # | 229 | # |
222 | add_test(NAME zlib_add_subdirectory_exclude_configure | 230 | add_test( |
223 | COMMAND ${CMAKE_COMMAND} | 231 | NAME zlib_add_subdirectory_exclude_configure |
224 | ${PLATFORM} | 232 | COMMAND |
225 | -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build | 233 | ${CMAKE_COMMAND} ${PLATFORM} |
226 | -DCMAKE_BUILD_TYPE=$<CONFIG> | 234 | -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build |
227 | -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} | 235 | -DCMAKE_BUILD_TYPE=$<CONFIG> -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} |
228 | -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} | 236 | -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} |
229 | -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install | 237 | -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install --fresh |
230 | --fresh | 238 | -G "${CMAKE_GENERATOR}" -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) |
231 | -G "${CMAKE_GENERATOR}" | 239 | |
232 | -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) | 240 | add_test( |
233 | 241 | NAME zlib_add_subdirectory_exclude_build | |
234 | add_test(NAME zlib_add_subdirectory_exclude_build | 242 | COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG> |
235 | COMMAND ${CMAKE_COMMAND} --build . | 243 | WORKING_DIRECTORY |
236 | --config $<CONFIG> | 244 | ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build) |
237 | WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build) | 245 | |
238 | 246 | add_test( | |
239 | add_test(NAME zlib_add_subdirectory_exclude_test | 247 | NAME zlib_add_subdirectory_exclude_test |
240 | COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> | 248 | COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> |
241 | WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build) | 249 | WORKING_DIRECTORY |
250 | ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build) | ||
242 | 251 | ||
243 | set_tests_properties(zlib_add_subdirectory_exclude_configure PROPERTIES | 252 | set_tests_properties( |
244 | FIXTURES_REQUIRED zlib_install | 253 | zlib_add_subdirectory_exclude_configure |
245 | FIXTURES_SETUP asx_config) | 254 | PROPERTIES FIXTURES_REQUIRED zlib_install FIXTURES_SETUP asx_config) |
246 | 255 | ||
247 | set_tests_properties(zlib_add_subdirectory_exclude_build PROPERTIES | 256 | set_tests_properties( |
248 | FIXTURES_REQUIRED as_config | 257 | zlib_add_subdirectory_exclude_build PROPERTIES FIXTURES_REQUIRED as_config |
249 | FIXTURES_SETUP asx_build) | 258 | FIXTURES_SETUP asx_build) |
250 | 259 | ||
251 | set_tests_properties(zlib_add_subdirectory_exclude_test PROPERTIES | 260 | set_tests_properties( |
252 | FIXTURES_REQUIRED asx_build | 261 | zlib_add_subdirectory_exclude_test |
253 | ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1) | 262 | PROPERTIES FIXTURES_REQUIRED asx_build ENVIRONMENT |
263 | CTEST_OUTPUT_ON_FAILURE=1) | ||
diff --git a/test/add_subdirectory_exclude_test.cmake.in b/test/add_subdirectory_exclude_test.cmake.in index c751a7a..c1e8cf4 100644 --- a/test/add_subdirectory_exclude_test.cmake.in +++ b/test/add_subdirectory_exclude_test.cmake.in | |||
@@ -1,6 +1,7 @@ | |||
1 | cmake_minimum_required(VERSION 3.10) | 1 | cmake_minimum_required(VERSION 3.10) |
2 | 2 | ||
3 | project(zlib_find_package_test | 3 | project( |
4 | zlib_find_package_test | ||
4 | LANGUAGES C | 5 | LANGUAGES C |
5 | VERSION @zlib_VERSION@) | 6 | VERSION @zlib_VERSION@) |
6 | 7 | ||
@@ -9,7 +10,8 @@ option(ZLIB_BUILD_TESTING "" OFF) | |||
9 | option(ZLIB_BUILD_SHARED "" @ZLIB_BUILD_SHARED@) | 10 | option(ZLIB_BUILD_SHARED "" @ZLIB_BUILD_SHARED@) |
10 | option(ZLIB_BUILD_STATIC "" @ZLIB_BUILD_STATIC@) | 11 | option(ZLIB_BUILD_STATIC "" @ZLIB_BUILD_STATIC@) |
11 | 12 | ||
12 | add_subdirectory(@zlib_SOURCE_DIR@ ${CMAKE_CURRENT_BINARY_DIR}/zlib EXCLUDE_FROM_ALL) | 13 | add_subdirectory(@zlib_SOURCE_DIR@ ${CMAKE_CURRENT_BINARY_DIR}/zlib |
14 | EXCLUDE_FROM_ALL) | ||
13 | 15 | ||
14 | if(ZLIB_BUILD_SHARED) | 16 | if(ZLIB_BUILD_SHARED) |
15 | add_executable(test_example @zlib_SOURCE_DIR@/test/example.c) | 17 | add_executable(test_example @zlib_SOURCE_DIR@/test/example.c) |
@@ -23,6 +25,5 @@ endif(ZLIB_BUILD_SHARED) | |||
23 | if(ZLIB_BUILD_STATIC) | 25 | if(ZLIB_BUILD_STATIC) |
24 | add_executable(test_example_static @zlib_SOURCE_DIR@/test/example.c) | 26 | add_executable(test_example_static @zlib_SOURCE_DIR@/test/example.c) |
25 | target_link_libraries(test_example_static ZLIB::ZLIBSTATIC) | 27 | target_link_libraries(test_example_static ZLIB::ZLIBSTATIC) |
26 | add_test(NAME zlib_test_example_static | 28 | add_test(NAME zlib_test_example_static COMMAND test_example_static) |
27 | COMMAND test_example_static) | ||
28 | endif(ZLIB_BUILD_STATIC) | 29 | endif(ZLIB_BUILD_STATIC) |
diff --git a/test/add_subdirectory_test.cmake.in b/test/add_subdirectory_test.cmake.in index d5e3a05..c7d20f8 100644 --- a/test/add_subdirectory_test.cmake.in +++ b/test/add_subdirectory_test.cmake.in | |||
@@ -1,6 +1,7 @@ | |||
1 | cmake_minimum_required(VERSION 3.10) | 1 | cmake_minimum_required(VERSION 3.10) |
2 | 2 | ||
3 | project(zlib_find_package_test | 3 | project( |
4 | zlib_find_package_test | ||
4 | LANGUAGES C | 5 | LANGUAGES C |
5 | VERSION @zlib_VERSION@) | 6 | VERSION @zlib_VERSION@) |
6 | 7 | ||
@@ -23,6 +24,5 @@ endif(ZLIB_BUILD_SHARED) | |||
23 | if(ZLIB_BUILD_STATIC) | 24 | if(ZLIB_BUILD_STATIC) |
24 | add_executable(test_example_static @zlib_SOURCE_DIR@/test/example.c) | 25 | add_executable(test_example_static @zlib_SOURCE_DIR@/test/example.c) |
25 | target_link_libraries(test_example_static ZLIB::ZLIBSTATIC) | 26 | target_link_libraries(test_example_static ZLIB::ZLIBSTATIC) |
26 | add_test(NAME zlib_test_example_static | 27 | add_test(NAME zlib_test_example_static COMMAND test_example_static) |
27 | COMMAND test_example_static) | ||
28 | endif(@ZLIB_BUILD_STATIC) | 28 | endif(@ZLIB_BUILD_STATIC) |
diff --git a/test/find_package_test.cmake.in b/test/find_package_test.cmake.in index 728a1a4..afacde5 100644 --- a/test/find_package_test.cmake.in +++ b/test/find_package_test.cmake.in | |||
@@ -1,6 +1,7 @@ | |||
1 | cmake_minimum_required(VERSION 3.10) | 1 | cmake_minimum_required(VERSION 3.10) |
2 | 2 | ||
3 | project(zlib_find_package_test | 3 | project( |
4 | zlib_find_package_test | ||
4 | LANGUAGES C | 5 | LANGUAGES C |
5 | VERSION @zlib_VERSION@) | 6 | VERSION @zlib_VERSION@) |
6 | 7 | ||
@@ -21,6 +22,5 @@ endif(ZLIB_BUILD_SHARED) | |||
21 | if(ZLIB_BUILD_STATIC) | 22 | if(ZLIB_BUILD_STATIC) |
22 | add_executable(test_example_static @zlib_SOURCE_DIR@/test/example.c) | 23 | add_executable(test_example_static @zlib_SOURCE_DIR@/test/example.c) |
23 | target_link_libraries(test_example_static ZLIB::ZLIBSTATIC) | 24 | target_link_libraries(test_example_static ZLIB::ZLIBSTATIC) |
24 | add_test(NAME zlib_test_example_static | 25 | add_test(NAME zlib_test_example_static COMMAND test_example_static) |
25 | COMMAND test_example_static) | ||
26 | endif(ZLIB_BUILD_STATIC) | 26 | endif(ZLIB_BUILD_STATIC) |