[ROSTESTS] Resolve some WHS issues after the last few PRs (#8809)

* [WINETESTS:UIAUTOMATIONCORE] Add wineheaders to dependencies
* [ROSTESTS] Don't use kernel32_vista - Just gate UIAutomationCore tests
This commit is contained in:
Justin Miller
2026-03-30 00:14:05 -07:00
committed by GitHub
parent 863203030f
commit ddef59e124
2 changed files with 6 additions and 2 deletions

View File

@@ -117,7 +117,6 @@ add_subdirectory(sti)
add_subdirectory(sxs)
add_subdirectory(twain_32)
add_subdirectory(ucrtbase)
add_subdirectory(uiautomationcore)
add_subdirectory(urlmon)
add_subdirectory(user32)
add_subdirectory(userenv)
@@ -144,3 +143,7 @@ add_subdirectory(wtsapi32)
add_subdirectory(xcopy)
add_subdirectory(xinput1_3)
add_subdirectory(xmllite)
if(DLL_EXPORT_VERSION GREATER_EQUAL 0x600)
add_subdirectory(uiautomationcore)
endif()

View File

@@ -4,9 +4,10 @@ remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
add_executable(uiautomationcore_winetest uiautomation.c testlist.c)
add_dependencies(uiautomationcore_winetest wineheaders)
set_module_type(uiautomationcore_winetest win32cui)
target_link_libraries(uiautomationcore_winetest wine uuid)
add_importlibs(uiautomationcore_winetest ole32 oleacc oleaut32 propsys user32 uiautomationcore msvcrt kernel32_vista kernel32)
add_importlibs(uiautomationcore_winetest ole32 oleacc oleaut32 propsys user32 uiautomationcore msvcrt kernel32)
if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
target_compile_options(uiautomationcore_winetest PRIVATE -Wno-format-overflow -Wno-discarded-qualifiers)