From 8b8a124eb42b027dceab01c7d4942a18c756d28e Mon Sep 17 00:00:00 2001 From: Vollstrecker Date: Fri, 3 Jan 2025 09:50:16 +0100 Subject: CMake: Add cmake-format.yaml and reformat the cmake files. --- test/CMakeLists.txt | 306 ++++++++++++++-------------- test/add_subdirectory_exclude_test.cmake.in | 9 +- test/add_subdirectory_test.cmake.in | 6 +- test/find_package_test.cmake.in | 6 +- 4 files changed, 169 insertions(+), 158 deletions(-) (limited to 'test') 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 @@ -function (ZLIB_findTestEnv testName) - set (testEnv "PATH=") +function(ZLIB_findTestEnv testName) + set(testEnv "PATH=") - if (MSVC OR MINGW) - set (separator "\\\;") - else() - set (separator ":") - endif() + if(MSVC OR MINGW) + set(separator "\\\;") + else() + set(separator ":") + endif() - string (APPEND testEnv "$${separator}") - string (APPEND testEnv "$ENV{PATH}") + string(APPEND testEnv "$${separator}") + string(APPEND testEnv "$ENV{PATH}") - set_tests_properties (${testName} PROPERTIES - ENVIRONMENT "${testEnv}" - ) + set_tests_properties(${testName} PROPERTIES ENVIRONMENT "${testEnv}") endfunction() if(ZLIB_BUILD_SHARED) add_executable(zlib_example example.c) target_link_libraries(zlib_example ZLIB::ZLIB) - add_test(NAME zlib_example - COMMAND zlib_example) + add_test(NAME zlib_example COMMAND zlib_example) add_executable(minigzip minigzip.c) - target_compile_definitions(minigzip - PRIVATE - $<$:HAVE_HIDDEN>) + target_compile_definitions( + minigzip PRIVATE $<$:HAVE_HIDDEN>) target_link_libraries(minigzip ZLIB::ZLIB) - if (MSVC OR MSYS OR MINGW OR CYGWIN) - ZLIB_findTestEnv (zlib_example) - endif (MSVC OR MSYS OR MINGW OR CYGWIN) + if(MSVC + OR MSYS + OR MINGW + OR CYGWIN) + zlib_findtestenv(zlib_example) + endif( + MSVC + OR MSYS + OR MINGW + OR CYGWIN) if(HAVE_OFF64_T) add_executable(zlib_example64 example.c) - target_compile_definitions(zlib_example64 - PRIVATE - LARGEFILE64_SOURCE=1 - $<$:HAVE_HIDDEN>) + target_compile_definitions( + zlib_example64 + PRIVATE LARGEFILE64_SOURCE=1 + $<$:HAVE_HIDDEN>) target_link_libraries(zlib_example64 ZLIB::ZLIB) - add_test(NAME zlib_example64 - COMMAND zlib_example64) - - if (MSVC OR MSYS OR MINGW OR CYGWIN) - ZLIB_findTestEnv (zlib_example64) - endif (MSVC OR MSYS OR MINGW OR CYGWIN) + add_test(NAME zlib_example64 COMMAND zlib_example64) + + if(MSVC + OR MSYS + OR MINGW + OR CYGWIN) + zlib_findtestenv(zlib_example64) + endif( + MSVC + OR MSYS + OR MINGW + OR CYGWIN) endif(HAVE_OFF64_T) endif(ZLIB_BUILD_SHARED) if(ZLIB_BUILD_STATIC) add_executable(zlib_static_example example.c) target_link_libraries(zlib_static_example ZLIB::ZLIBSTATIC) - target_compile_definitions(zlib_static_example - PRIVATE - $<$:HAVE_HIDDEN>) - add_test(NAME zlib_static_example - COMMAND zlib_static_example) + target_compile_definitions( + zlib_static_example + PRIVATE $<$:HAVE_HIDDEN>) + add_test(NAME zlib_static_example COMMAND zlib_static_example) add_executable(static_minigzip minigzip.c) target_link_libraries(static_minigzip ZLIB::ZLIBSTATIC) - if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR - ${CMAKE_C_COMPILER_ID} STREQUAL "Clang") + if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_C_COMPILER_ID} STREQUAL + "Clang") set(CFLAGS_OLD ${CMAKE_C_FLAGS}) - set({CMAKE_C_FLAGS "" CACHE STRING "" FORCE) + set({CMAKE_C_FLAGS + "" + CACHE STRING "" FORCE) if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU") find_program(GCOV_EXECUTABLE gcov) @@ -73,7 +83,7 @@ if(ZLIB_BUILD_STATIC) list(APPEND llvm_names llvm-cov) foreach(ver RANGE 11 99) - list(APPEND llvm_names llvm-cov-${ver}) + list(APPEND llvm_names llvm-cov-${ver}) endforeach(ver RANGE 11 99) find_program(GCOV_EXECUTABLE NAMES ${llvm_names}) @@ -84,57 +94,57 @@ if(ZLIB_BUILD_STATIC) target_link_libraries(infcover ZLIB::ZLIBSTATIC) target_compile_options(infcover PRIVATE -coverage) target_link_options(infcover PRIVATE -coverage) - target_compile_definitions(infcover - PRIVATE - $<$:HAVE_HIDDEN>) - add_test (NAME zlib-coverage COMMAND infcover) - set (INFCOVER_DIR - ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/infcover.dir) - add_test (NAME zlib-coverage-summary - COMMAND ${GCOV_EXECUTABLE} ${llvm_option} - ${CMAKE_CURRENT_SOURCE_DIR}/infcover.c - -o ${INFCOVER_DIR}/infcover.c.gcda) - set_tests_properties(zlib-coverage-summary PROPERTIES DEPENDS zlib-coverage) - set({CMAKE_C_FLAGS ${CFLAGS_OLD} CACHE STRING "" FORCE) - endif(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR - ${CMAKE_C_COMPILER_ID} STREQUAL "Clang") + target_compile_definitions( + infcover PRIVATE $<$:HAVE_HIDDEN>) + add_test(NAME zlib-coverage COMMAND infcover) + set(INFCOVER_DIR ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/infcover.dir) + add_test( + NAME zlib-coverage-summary + COMMAND + ${GCOV_EXECUTABLE} ${llvm_option} + ${CMAKE_CURRENT_SOURCE_DIR}/infcover.c -o + ${INFCOVER_DIR}/infcover.c.gcda) + set_tests_properties(zlib-coverage-summary PROPERTIES DEPENDS + zlib-coverage) + set({CMAKE_C_FLAGS + ${CFLAGS_OLD} + CACHE STRING "" FORCE) + endif(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_C_COMPILER_ID} + STREQUAL "Clang") if(HAVE_OFF64_T) add_executable(zlib_static_example64 example.c) - target_compile_definitions(zlib_static_example64 - PRIVATE - LARGEFILE64_SOURCE=1 - $<$:HAVE_HIDDEN>) + target_compile_definitions( + zlib_static_example64 + PRIVATE LARGEFILE64_SOURCE=1 + $<$:HAVE_HIDDEN>) target_link_libraries(zlib_static_example64 ZLIB::ZLIBSTATIC) - add_test(NAME zlib_static_example64 - COMMAND zlib_static_example64) + add_test(NAME zlib_static_example64 COMMAND zlib_static_example64) endif(HAVE_OFF64_T) endif(ZLIB_BUILD_STATIC) -add_test(NAME zlib_install - COMMAND ${CMAKE_COMMAND} --install ${zlib_BINARY_DIR} - --prefix ${CMAKE_CURRENT_BINARY_DIR}/test_install - --config $ +add_test( + NAME zlib_install + COMMAND ${CMAKE_COMMAND} --install ${zlib_BINARY_DIR} --prefix + ${CMAKE_CURRENT_BINARY_DIR}/test_install --config $ WORKING_DIRECTORY ${zlib_BINARY_DIR}) -set_tests_properties(zlib_install - PROPERTIES - FIXTURES_SETUP zlib_install) +set_tests_properties(zlib_install PROPERTIES FIXTURES_SETUP zlib_install) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test/CMakeLists.txt - @ONLY) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test/CMakeLists.txt @ONLY) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test/CMakeLists.txt - @ONLY) + ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test/CMakeLists.txt @ONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt @ONLY) @@ -147,107 +157,107 @@ endif(GENERATOR) # # findpackage_test # -add_test(NAME zlib_find_package_configure - COMMAND ${CMAKE_COMMAND} - ${PLATFORM} +add_test( + NAME zlib_find_package_configure + COMMAND + ${CMAKE_COMMAND} ${PLATFORM} -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build - -DCMAKE_BUILD_TYPE=$ - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_BUILD_TYPE=$ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} - -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install - --fresh - -G "${CMAKE_GENERATOR}" - -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) - -add_test(NAME zlib_find_package_build - COMMAND ${CMAKE_COMMAND} --build . - --config $ + -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install --fresh + -G "${CMAKE_GENERATOR}" -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) + +add_test( + NAME zlib_find_package_build + COMMAND ${CMAKE_COMMAND} --build . --config $ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build) -add_test(NAME zlib_find_package_test +add_test( + NAME zlib_find_package_test COMMAND ${CMAKE_CTEST_COMMAND} -C $ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build) -set_tests_properties(zlib_find_package_configure PROPERTIES - FIXTURES_REQUIRED zlib_install - FIXTURES_SETUP fp_config) +set_tests_properties( + zlib_find_package_configure PROPERTIES FIXTURES_REQUIRED zlib_install + FIXTURES_SETUP fp_config) -set_tests_properties(zlib_find_package_build PROPERTIES - FIXTURES_REQUIRED fp_config - FIXTURES_SETUP fp_build) +set_tests_properties( + zlib_find_package_build PROPERTIES FIXTURES_REQUIRED fp_config + FIXTURES_SETUP fp_build) -set_tests_properties(zlib_find_package_test PROPERTIES - FIXTURES_REQUIRED fp_build - ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1) +set_tests_properties( + zlib_find_package_test PROPERTIES FIXTURES_REQUIRED fp_build ENVIRONMENT + CTEST_OUTPUT_ON_FAILURE=1) # # add_subdirectory_test # -add_test(NAME zlib_add_subdirectory_configure - COMMAND ${CMAKE_COMMAND} - ${PLATFORM} - -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build - -DCMAKE_BUILD_TYPE=$ - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} - -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install - --fresh - -G "${CMAKE_GENERATOR}" - -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) - -add_test(NAME zlib_add_subdirectory_build - COMMAND ${CMAKE_COMMAND} --build . - --config $ +add_test( + NAME zlib_add_subdirectory_configure + COMMAND + ${CMAKE_COMMAND} ${PLATFORM} + -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build + -DCMAKE_BUILD_TYPE=$ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} + -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install --fresh + -G "${CMAKE_GENERATOR}" -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) + +add_test( + NAME zlib_add_subdirectory_build + COMMAND ${CMAKE_COMMAND} --build . --config $ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build) -add_test(NAME zlib_add_subdirectory_test +add_test( + NAME zlib_add_subdirectory_test COMMAND ${CMAKE_CTEST_COMMAND} -C $ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build) -set_tests_properties(zlib_add_subdirectory_configure PROPERTIES - FIXTURES_REQUIRED zlib_install - FIXTURES_SETUP as_config) +set_tests_properties( + zlib_add_subdirectory_configure PROPERTIES FIXTURES_REQUIRED zlib_install + FIXTURES_SETUP as_config) -set_tests_properties(zlib_add_subdirectory_build PROPERTIES - FIXTURES_REQUIRED as_config - FIXTURES_SETUP as_build) +set_tests_properties( + zlib_add_subdirectory_build PROPERTIES FIXTURES_REQUIRED as_config + FIXTURES_SETUP as_build) -set_tests_properties(zlib_add_subdirectory_test PROPERTIES - FIXTURES_REQUIRED as_build - ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1) +set_tests_properties( + zlib_add_subdirectory_test PROPERTIES FIXTURES_REQUIRED as_build + ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1) # # add_subdirectory_exclude_test # -add_test(NAME zlib_add_subdirectory_exclude_configure - COMMAND ${CMAKE_COMMAND} - ${PLATFORM} - -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build - -DCMAKE_BUILD_TYPE=$ - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} - -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install - --fresh - -G "${CMAKE_GENERATOR}" - -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) - -add_test(NAME zlib_add_subdirectory_exclude_build - COMMAND ${CMAKE_COMMAND} --build . - --config $ - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build) - -add_test(NAME zlib_add_subdirectory_exclude_test +add_test( + NAME zlib_add_subdirectory_exclude_configure + COMMAND + ${CMAKE_COMMAND} ${PLATFORM} + -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build + -DCMAKE_BUILD_TYPE=$ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} + -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install --fresh + -G "${CMAKE_GENERATOR}" -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) + +add_test( + NAME zlib_add_subdirectory_exclude_build + COMMAND ${CMAKE_COMMAND} --build . --config $ + WORKING_DIRECTORY + ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build) + +add_test( + NAME zlib_add_subdirectory_exclude_test COMMAND ${CMAKE_CTEST_COMMAND} -C $ - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build) + WORKING_DIRECTORY + ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build) -set_tests_properties(zlib_add_subdirectory_exclude_configure PROPERTIES - FIXTURES_REQUIRED zlib_install - FIXTURES_SETUP asx_config) +set_tests_properties( + zlib_add_subdirectory_exclude_configure + PROPERTIES FIXTURES_REQUIRED zlib_install FIXTURES_SETUP asx_config) -set_tests_properties(zlib_add_subdirectory_exclude_build PROPERTIES - FIXTURES_REQUIRED as_config - FIXTURES_SETUP asx_build) +set_tests_properties( + zlib_add_subdirectory_exclude_build PROPERTIES FIXTURES_REQUIRED as_config + FIXTURES_SETUP asx_build) -set_tests_properties(zlib_add_subdirectory_exclude_test PROPERTIES - FIXTURES_REQUIRED asx_build - ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1) +set_tests_properties( + zlib_add_subdirectory_exclude_test + PROPERTIES FIXTURES_REQUIRED asx_build 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 c751a7a..c1e8cf4 100644 --- a/test/add_subdirectory_exclude_test.cmake.in +++ b/test/add_subdirectory_exclude_test.cmake.in @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.10) -project(zlib_find_package_test +project( + zlib_find_package_test LANGUAGES C VERSION @zlib_VERSION@) @@ -9,7 +10,8 @@ option(ZLIB_BUILD_TESTING "" OFF) option(ZLIB_BUILD_SHARED "" @ZLIB_BUILD_SHARED@) option(ZLIB_BUILD_STATIC "" @ZLIB_BUILD_STATIC@) -add_subdirectory(@zlib_SOURCE_DIR@ ${CMAKE_CURRENT_BINARY_DIR}/zlib EXCLUDE_FROM_ALL) +add_subdirectory(@zlib_SOURCE_DIR@ ${CMAKE_CURRENT_BINARY_DIR}/zlib + EXCLUDE_FROM_ALL) if(ZLIB_BUILD_SHARED) add_executable(test_example @zlib_SOURCE_DIR@/test/example.c) @@ -23,6 +25,5 @@ endif(ZLIB_BUILD_SHARED) if(ZLIB_BUILD_STATIC) add_executable(test_example_static @zlib_SOURCE_DIR@/test/example.c) target_link_libraries(test_example_static ZLIB::ZLIBSTATIC) - add_test(NAME zlib_test_example_static - COMMAND test_example_static) + add_test(NAME zlib_test_example_static COMMAND test_example_static) 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 @@ cmake_minimum_required(VERSION 3.10) -project(zlib_find_package_test +project( + zlib_find_package_test LANGUAGES C VERSION @zlib_VERSION@) @@ -23,6 +24,5 @@ endif(ZLIB_BUILD_SHARED) if(ZLIB_BUILD_STATIC) add_executable(test_example_static @zlib_SOURCE_DIR@/test/example.c) target_link_libraries(test_example_static ZLIB::ZLIBSTATIC) - add_test(NAME zlib_test_example_static - COMMAND test_example_static) + add_test(NAME zlib_test_example_static COMMAND test_example_static) 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 @@ cmake_minimum_required(VERSION 3.10) -project(zlib_find_package_test +project( + zlib_find_package_test LANGUAGES C VERSION @zlib_VERSION@) @@ -21,6 +22,5 @@ endif(ZLIB_BUILD_SHARED) if(ZLIB_BUILD_STATIC) add_executable(test_example_static @zlib_SOURCE_DIR@/test/example.c) target_link_libraries(test_example_static ZLIB::ZLIBSTATIC) - add_test(NAME zlib_test_example_static - COMMAND test_example_static) + add_test(NAME zlib_test_example_static COMMAND test_example_static) endif(ZLIB_BUILD_STATIC) -- cgit v1.2.3-55-g6feb