tests: Add support of testing on static Qt6 builds

johnzupin · johnzupin · commit b8a1d46c440d · 2025-05-28T11:11:19.000-06:00
CMakeLists.txt:
- Remove USE_STATIC_RT_VKCONFIG option
- Use set_property to set MSVC_RUNTIME_LIBRARY property

layersvt/test/CMakeLists.txt
vkconfig_core/test/CMakeLists.txt
- Use set_property to set MSVC_RUNTIME_LIBRARY property

vkconfig_cmd/CMakeLists.txt
- Remove use of USE_STATIC_RT_VKCONFIG

vkconfig_core/CMakeLists.txt
- Remove use of USE_STATIC_RT_VKCONFIG

vkconfig_core/test/CMakeLists.txt
- Remove use of USE_STATIC_RT_VKCONFIG
- Cleanup and formatting
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -76,7 +76,7 @@ jobs:
           version: '5.15.*'
       - run: cmake -S . -B build -D UPDATE_DEPS=ON -D BUILD_TESTS=ON -D RUN_ON_GITHUB=ON -D CMAKE_BUILD_TYPE=Debug -G Ninja
       - run: cmake --build build
-      - run: ctest --output-on-failure --test-dir build
+      - run: ctest --output-on-failure --test-dir build --timeout 10
       - run: cmake --install build --prefix build/install
 
   windows:
@@ -91,7 +91,7 @@ jobs:
           version: '6.8.2'
       - run: cmake -S . -B build -D UPDATE_DEPS=ON -D BUILD_TESTS=ON -D RUN_ON_GITHUB=ON -D CMAKE_BUILD_TYPE=Debug -G Ninja
       - run: cmake --build build
-      - run: ctest --output-on-failure --test-dir build
+      - run: ctest --output-on-failure --test-dir build --timeout 10
       - run: cmake --install build --prefix build/install
 
   android:
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,10 +42,14 @@ find_package(VulkanUtilityLibraries REQUIRED CONFIG)
 find_package(valijson REQUIRED CONFIG)
 find_package(Qt6 COMPONENTS Core Gui Widgets Network QUIET)
 find_package(Qt5 COMPONENTS Core Gui Widgets Network QUIET)
+if(Qt6_FOUND)
+  get_target_property(QT_TARGET_TYPE Qt6::Core TYPE)
+elseif(Qt5_FOUND)
+  get_target_property(QT_TARGET_TYPE Qt5::Core TYPE)
+endif()
 
 option(BUILD_TESTS "Build tests")
 option(RUN_ON_GITHUB "Build only tests that can run on Github" OFF)
-option(USE_STATIC_RT_VKCONFIG "Use static C runtime for VkConfig when linking against static Qt libraires")
 
 if(BUILD_TESTS)
     enable_testing()
@@ -130,5 +134,11 @@ if(BUILD_LAYERMGR)
         add_subdirectory(vkconfig_core)
         add_subdirectory(vkconfig_cmd)
         add_subdirectory(vkconfig_gui)
+
+        if(WIN32 AND BUILD_TESTS AND (QT_TARGET_TYPE STREQUAL STATIC_LIBRARY))
+            set_property(TARGET vkconfig-gui vkconfig-cmd vkconfig-core PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+            message(STATUS "vkconfig will link against static runtime")
+        endif()
+
     endif()
 endif()
diff --git a/layersvt/test/CMakeLists.txt b/layersvt/test/CMakeLists.txt
@@ -41,6 +41,10 @@ function(LayerTest NAME)
     )
 
     set_target_properties(${TEST_NAME} PROPERTIES FOLDER "VkLayer_${NAME}/Test")
+
+    if(WIN32 AND (QT_TARGET_TYPE STREQUAL STATIC_LIBRARY))
+      set_property(TARGET ${TEST_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+    endif()
 endfunction()
 
 set(LAYER_TEST_FILES api_dump monitor screenshot)
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
@@ -60,6 +60,10 @@ if (UPDATE_DEPS)
         list(APPEND update_dep_command "--skip-existing-install")
     endif()
 
+    if(WIN32 AND BUILD_TESTS AND (QT_TARGET_TYPE STREQUAL STATIC_LIBRARY))
+        list(APPEND update_dep_command "--gtest-force-shared-crt=OFF")
+    endif()
+    
     list(APPEND cmake_vars "CMAKE_TOOLCHAIN_FILE")
     list(APPEND cmake_vars "CMAKE_SYSTEM_PROCESSOR")
 
diff --git a/vkconfig_cmd/CMakeLists.txt b/vkconfig_cmd/CMakeLists.txt
@@ -28,14 +28,6 @@ source_group("Docs Files" FILES ${FILES_DOCS})
 
 set(FILES_ALL ${FILES_UI} ${FILES_SOURCE} ${FILES_HEADER} ${FILES_DOCS})
 
-if(WIN32)
-    # Use the static runtime library? This is for special builds of Vulkan Configurator only
-    if(USE_STATIC_RT_VKCONFIG)
-        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-        message(STATUS "vkconfig-cmd will link against static runtime")
-    endif()    
-endif()
-
 if(NOT APPLE)
     if (NOT DEFINED CMAKE_INSTALL_BINDIR)
         include(GNUInstallDirs)
diff --git a/vkconfig_core/CMakeLists.txt b/vkconfig_core/CMakeLists.txt
@@ -32,14 +32,6 @@ set(FILES_RESOURCES
 
 set(FILES_ALL ${FILES_SOURCE} ${FILES_HEADER} ${FILES_RESOURCES})
 
-if(WIN32)
-    # Use the static runtime library? This is for special builds of Vulkan Configurator only
-    if(USE_STATIC_RT_VKCONFIG)
-        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-        message(STATUS "vkconfig-core will link against static runtime")
-    endif()    
-endif()
-
 add_library(vkconfig-core STATIC ${FILES_ALL})
 target_compile_options(vkconfig-core PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/MP>)
 target_compile_definitions(vkconfig-core PRIVATE QT_NO_DEBUG_OUTPUT QT_NO_WARNING_OUTPUT)
diff --git a/vkconfig_core/test/CMakeLists.txt b/vkconfig_core/test/CMakeLists.txt
@@ -20,14 +20,6 @@ if (NOT DEFINED CMAKE_INSTALL_BINDIR)
     include(GNUInstallDirs)
 endif()
 
-if(WIN32)
-    # Use the static runtime library? This is for special builds of Vulkan Configurator only
-    if(USE_STATIC_RT_VKCONFIG)
-        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-        message(STATUS "vkconfig-core will link against static runtime")
-    endif()    
-endif()
-
 function(vkConfigTest NAME)
     set(TEST_FILE ./${NAME}.cpp)
     set(TEST_NAME vkconfig_${NAME})
@@ -39,25 +31,20 @@ function(vkConfigTest NAME)
 
     add_executable(${TEST_NAME} ${TEST_FILE} ${FILES_JSON} ${FILES_TEXT} resources.qrc)
     set_target_properties(${TEST_NAME} PROPERTIES FOLDER "vkconfig/tests")
-if(Qt6_FOUND)
-    target_link_libraries(${TEST_NAME} vkconfig-core Vulkan::LayerSettings GTest::gtest GTest::gtest_main Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Network)
-elseif(Qt5_FOUND)
-    target_link_libraries(${TEST_NAME} vkconfig-core Vulkan::LayerSettings GTest::gtest GTest::gtest_main Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network)
-endif()
-
-    if(WIN32)
-	# Use the static runtime library?
-	if(USE_STATIC_CRT_VKFG)
- 	    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-	    message(STATUS "vkconfig tests will link against static runtime")
-	endif()
-
-        target_link_libraries(${TEST_NAME} Cfgmgr32)
+    if(Qt6_FOUND)
+      target_link_libraries(${TEST_NAME} vkconfig-core Vulkan::LayerSettings GTest::gtest GTest::gtest_main Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Network)
+    elseif(Qt5_FOUND)
+      target_link_libraries(${TEST_NAME} vkconfig-core Vulkan::LayerSettings GTest::gtest GTest::gtest_main Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network)
     endif()
+
     if (RUN_ON_GITHUB)
         target_compile_definitions(${TEST_NAME} PRIVATE RUN_ON_GITHUB)
     endif()
 
+    if(WIN32 AND (QT_TARGET_TYPE STREQUAL STATIC_LIBRARY))
+      set_property(TARGET ${TEST_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+    endif()
+
     add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME})
 endfunction()
 
diff --git a/vkconfig_gui/CMakeLists.txt b/vkconfig_gui/CMakeLists.txt
@@ -16,14 +16,6 @@ source_group("Docs Files" FILES ${FILES_DOCS})
 
 set(FILES_ALL ${FILES_UI} ${FILES_SOURCE} ${FILES_HEADER} ${FILES_DOCS} resources.qrc)
 
-if(WIN32)
-    # Use the static runtime library? This is for special builds of Vulkan Configurator only
-    if(USE_STATIC_RT_VKCONFIG)
-        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-        message(STATUS "vkconfig-gui will link against static runtime")
-    endif()    
-endif()
-
 if(NOT APPLE)
     if (NOT DEFINED CMAKE_INSTALL_BINDIR)
         include(GNUInstallDirs)

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,10 @@ function(LayerTest NAME)`
`41`	`41`	`)`
`42`	`42`
`43`	`43`	`set_target_properties(${TEST_NAME} PROPERTIES FOLDER "VkLayer_${NAME}/Test")`
	`44`	`+`
	`45`	`+ if(WIN32 AND (QT_TARGET_TYPE STREQUAL STATIC_LIBRARY))`
	`46`	`+ set_property(TARGET ${TEST_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")`
	`47`	`+ endif()`
`44`	`48`	`endfunction()`
`45`	`49`
`46`	`50`	`set(LAYER_TEST_FILES api_dump monitor screenshot)`