From fdc7404466c30e6977ff27013ec34cf39e0b2cd4 Mon Sep 17 00:00:00 2001 From: Jan Kuhlmann <33833587+M2-TE@users.noreply.github.com> Date: Wed, 19 Mar 2025 14:21:25 +0100 Subject: [PATCH] merged subdirectory tests --- tests/CMakeLists.txt | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c2e2be7..d21c835 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -6,22 +6,13 @@ # SPDX-License-Identifier: Apache-2.0 # ~~~ -# Test add_subdirectory suppport for headers -add_test(NAME integration.add_subdirectory_headers +# Test add_subdirectory suppport +add_test(NAME integration.add_subdirectory COMMAND ${CMAKE_CTEST_COMMAND} --build-and-test ${CMAKE_CURRENT_LIST_DIR}/integration - ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_headers + ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory --build-generator ${CMAKE_GENERATOR} - --build-options -DFIND_PACKAGE_TESTING=OFF -DVULKAN_HEADERS_ENABLE_MODULE=OFF -) - -# Test add_subdirectory suppport for C++20 modules -add_test(NAME integration.add_subdirectory_modules - COMMAND ${CMAKE_CTEST_COMMAND} - --build-and-test ${CMAKE_CURRENT_LIST_DIR}/integration - ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_modules - --build-generator ${CMAKE_GENERATOR} - --build-options -DFIND_PACKAGE_TESTING=OFF -DVULKAN_HEADERS_ENABLE_MODULE=ON + --build-options -DFIND_PACKAGE_TESTING=OFF -DVULKAN_HEADERS_ENABLE_MODULE=${VULKAN_HEADERS_ENABLE_MODULE} ) set(test_install_dir "${CMAKE_CURRENT_BINARY_DIR}/install")