diff --git a/modules/rostests/winetests/CMakeLists.txt b/modules/rostests/winetests/CMakeLists.txt index ab51fd9b382..aa2e23692cc 100644 --- a/modules/rostests/winetests/CMakeLists.txt +++ b/modules/rostests/winetests/CMakeLists.txt @@ -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() diff --git a/modules/rostests/winetests/uiautomationcore/CMakeLists.txt b/modules/rostests/winetests/uiautomationcore/CMakeLists.txt index d22b4ea8310..66bfd44b7c0 100644 --- a/modules/rostests/winetests/uiautomationcore/CMakeLists.txt +++ b/modules/rostests/winetests/uiautomationcore/CMakeLists.txt @@ -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)