diff --git a/reactos/CMakeLists.txt b/reactos/CMakeLists.txt index 4e13b516608..d94c37b00e9 100644 --- a/reactos/CMakeLists.txt +++ b/reactos/CMakeLists.txt @@ -40,7 +40,6 @@ set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE) set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE) set(CMAKE_COLOR_MAKEFILE OFF) #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) -set(CMAKE_SKIP_INSTALL_RULES ON) if(NOT DEFINED NEW_STYLE_BUILD) set(NEW_STYLE_BUILD TRUE) diff --git a/reactos/sdk/cmake/CMakeMacros.cmake b/reactos/sdk/cmake/CMakeMacros.cmake index 3ef19d77f95..c9c915dc2b6 100644 --- a/reactos/sdk/cmake/CMakeMacros.cmake +++ b/reactos/sdk/cmake/CMakeMacros.cmake @@ -817,3 +817,22 @@ endif() function(add_rc_deps _target_rc) set_source_files_properties(${_target_rc} PROPERTIES OBJECT_DEPENDS "${ARGN}") endfunction() + +add_custom_target(rostests_install COMMAND ${CMAKE_COMMAND} -DCOMPONENT=rostests -P ${CMAKE_BINARY_DIR}/cmake_install.cmake) +function(add_rostests_file) + cmake_parse_arguments(_ROSTESTS "" "SUBDIR;TARGET" "FILE" ${ARGN}) + if(NOT (_ROSTESTS_TARGET OR _ROSTESTS_FILE)) + message(FATAL_ERROR "You must provide a target or a file to install!") + endif() + + if(NOT _ROSTESTS_FILE) + get_target_property(_ROSTESTS_FILE ${_ROSTESTS_TARGET} LOCATION_${CMAKE_BUILD_TYPE}) + endif() + + if(_ROSTESTS_SUBDIR) + set(_ROSTESTS_SUBDIR "/${_ROSTESTS_SUBDIR}") + endif() + + add_cd_file(FILE ${_ROSTESTS_FILE} DESTINATION "reactos/bin${_ROSTESTS_SUBDIR}" FOR all) + install(FILES ${_ROSTESTS_FILE} DESTINATION "$ENV{ROSTESTS_INSTALL}${_ROSTESTS_SUBDIR}" COMPONENT rostests) +endfunction() diff --git a/rostests/CMakeLists.txt b/rostests/CMakeLists.txt index 033ec828f84..1f8062b9ffe 100644 --- a/rostests/CMakeLists.txt +++ b/rostests/CMakeLists.txt @@ -21,7 +21,7 @@ add_subdirectory(winetests) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/testdata/) file(GLOB_RECURSE TESTDATA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/testdata/ ${CMAKE_CURRENT_SOURCE_DIR}/testdata/*) foreach(item ${TESTDATA_FILES}) - add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/testdata/${item} DESTINATION reactos/bin/testdata NAME_ON_CD ${item} FOR all) + add_rostests_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/testdata/${item} SUBDIR testdata) endforeach(item) endif() diff --git a/rostests/apitests/advapi32/CMakeLists.txt b/rostests/apitests/advapi32/CMakeLists.txt index b01d4ccd2ea..c446e0f046c 100644 --- a/rostests/apitests/advapi32/CMakeLists.txt +++ b/rostests/apitests/advapi32/CMakeLists.txt @@ -22,4 +22,4 @@ add_executable(advapi32_apitest ${SOURCE}) target_link_libraries(advapi32_apitest wine ${PSEH_LIB}) set_module_type(advapi32_apitest win32cui) add_importlibs(advapi32_apitest advapi32 msvcrt kernel32 ntdll) -add_cd_file(TARGET advapi32_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET advapi32_apitest) diff --git a/rostests/apitests/apphelp/CMakeLists.txt b/rostests/apitests/apphelp/CMakeLists.txt index 442cfc81366..2a890276f14 100644 --- a/rostests/apitests/apphelp/CMakeLists.txt +++ b/rostests/apitests/apphelp/CMakeLists.txt @@ -11,4 +11,4 @@ list(APPEND SOURCE add_executable(apphelp_apitest ${SOURCE}) set_module_type(apphelp_apitest win32cui) add_importlibs(apphelp_apitest advapi32 userenv version shlwapi msvcrt kernel32 ntdll) -add_cd_file(TARGET apphelp_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET apphelp_apitest) diff --git a/rostests/apitests/appshim/CMakeLists.txt b/rostests/apitests/appshim/CMakeLists.txt index ae219599f65..48a4db166cf 100644 --- a/rostests/apitests/appshim/CMakeLists.txt +++ b/rostests/apitests/appshim/CMakeLists.txt @@ -9,4 +9,4 @@ list(APPEND SOURCE add_executable(appshim_apitest ${SOURCE}) set_module_type(appshim_apitest win32cui) add_importlibs(appshim_apitest version msvcrt kernel32 ntdll) -add_cd_file(TARGET appshim_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET appshim_apitest) diff --git a/rostests/apitests/atl/CMakeLists.txt b/rostests/apitests/atl/CMakeLists.txt index 6ca38ea8d20..99e526adfa6 100644 --- a/rostests/apitests/atl/CMakeLists.txt +++ b/rostests/apitests/atl/CMakeLists.txt @@ -20,4 +20,4 @@ add_executable(atl_apitest target_link_libraries(atl_apitest wine uuid) set_module_type(atl_apitest win32cui) add_importlibs(atl_apitest rpcrt4 ole32 oleaut32 msimg32 gdi32 advapi32 user32 msvcrt kernel32 ntdll) -add_cd_file(TARGET atl_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET atl_apitest) diff --git a/rostests/apitests/browseui/CMakeLists.txt b/rostests/apitests/browseui/CMakeLists.txt index e3d9700cba2..120b9519550 100644 --- a/rostests/apitests/browseui/CMakeLists.txt +++ b/rostests/apitests/browseui/CMakeLists.txt @@ -18,4 +18,4 @@ add_executable(browseui_apitest ${SOURCE}) target_link_libraries(browseui_apitest uuid wine) set_module_type(browseui_apitest win32cui) add_importlibs(browseui_apitest shell32 ole32 shlwapi msvcrt kernel32 ntdll) -add_cd_file(TARGET browseui_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET browseui_apitest) diff --git a/rostests/apitests/com/CMakeLists.txt b/rostests/apitests/com/CMakeLists.txt index 9f6fd85d9fe..1bd1adc47d9 100644 --- a/rostests/apitests/com/CMakeLists.txt +++ b/rostests/apitests/com/CMakeLists.txt @@ -16,4 +16,4 @@ add_executable(com_apitest ${SOURCE}) target_link_libraries(com_apitest wine uuid) set_module_type(com_apitest win32cui) add_importlibs(com_apitest advapi32 ole32 shlwapi shell32 msvcrt kernel32 ntdll) -add_cd_file(TARGET com_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET com_apitest) diff --git a/rostests/apitests/crt/crtdll_crt_apitest.cmake b/rostests/apitests/crt/crtdll_crt_apitest.cmake index 3178636497e..6aa52ef6773 100644 --- a/rostests/apitests/crt/crtdll_crt_apitest.cmake +++ b/rostests/apitests/crt/crtdll_crt_apitest.cmake @@ -557,4 +557,4 @@ add_target_compile_definitions(crtdll_crt_apitest TEST_CRTDLL) target_link_libraries(crtdll_crt_apitest wine ${PSEH_LIB}) set_module_type(crtdll_crt_apitest win32cui) add_importlibs(crtdll_crt_apitest crtdll msvcrt kernel32 ntdll) -add_cd_file(TARGET crtdll_crt_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET crtdll_crt_apitest) diff --git a/rostests/apitests/crt/msvcrt_crt_apitest.cmake b/rostests/apitests/crt/msvcrt_crt_apitest.cmake index 5d18d481279..eda23e48b87 100644 --- a/rostests/apitests/crt/msvcrt_crt_apitest.cmake +++ b/rostests/apitests/crt/msvcrt_crt_apitest.cmake @@ -1378,7 +1378,7 @@ endif() #target_link_libraries(static_crt_apitest ${PSEH_LIB} crt wine) #set_module_type(static_crt_apitest win32cui) #add_importlibs(static_crt_apitest kernel32 ntdll) -#add_cd_file(TARGET static_crt_apitest DESTINATION reactos/bin FOR all) +#add_rostests_file(TARGET static_crt_apitest) #spec2def(static_crt_dll_startup.dll dll_startup.spec) #add_library(static_crt_dll_startup SHARED @@ -1387,14 +1387,14 @@ endif() #target_link_libraries(static_crt_dll_startup crt) #set_module_type(static_crt_dll_startup win32dll) #add_importlibs(static_crt_dll_startup kernel32 ntdll) -#add_cd_file(TARGET static_crt_dll_startup DESTINATION reactos/bin FOR all) +#add_rostests_file(TARGET static_crt_dll_startup) add_executable(msvcrt_crt_apitest testlist.c ${SOURCE_MSVCRT}) add_target_compile_definitions(msvcrt_crt_apitest TEST_MSVCRT) target_link_libraries(msvcrt_crt_apitest wine ${PSEH_LIB}) set_module_type(msvcrt_crt_apitest win32cui) add_importlibs(msvcrt_crt_apitest msvcrt kernel32 ntdll) -add_cd_file(TARGET msvcrt_crt_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET msvcrt_crt_apitest) spec2def(msvcrt_crt_dll_startup.dll dll_startup.spec) add_library(msvcrt_crt_dll_startup SHARED @@ -1402,4 +1402,4 @@ add_library(msvcrt_crt_dll_startup SHARED ${CMAKE_CURRENT_BINARY_DIR}/msvcrt_crt_dll_startup.def) set_module_type(msvcrt_crt_dll_startup win32dll) add_importlibs(msvcrt_crt_dll_startup msvcrt kernel32 ntdll) -add_cd_file(TARGET msvcrt_crt_dll_startup DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET msvcrt_crt_dll_startup) diff --git a/rostests/apitests/crt/ntdll_crt_apitest.cmake b/rostests/apitests/crt/ntdll_crt_apitest.cmake index b401801207a..704288786fc 100644 --- a/rostests/apitests/crt/ntdll_crt_apitest.cmake +++ b/rostests/apitests/crt/ntdll_crt_apitest.cmake @@ -156,4 +156,4 @@ add_target_compile_definitions(ntdll_crt_apitest TEST_NTDLL) target_link_libraries(ntdll_crt_apitest wine ${PSEH_LIB}) set_module_type(ntdll_crt_apitest win32cui) add_importlibs(ntdll_crt_apitest ntdll msvcrt kernel32) -add_cd_file(TARGET ntdll_crt_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET ntdll_crt_apitest) diff --git a/rostests/apitests/dciman32/CMakeLists.txt b/rostests/apitests/dciman32/CMakeLists.txt index 4ae2d5bd89b..a4da03b07c7 100644 --- a/rostests/apitests/dciman32/CMakeLists.txt +++ b/rostests/apitests/dciman32/CMakeLists.txt @@ -4,4 +4,4 @@ add_executable(dciman32_apitest DCICreatePrimary.c testlist.c) target_link_libraries(dciman32_apitest wine) set_module_type(dciman32_apitest win32cui) add_importlibs(dciman32_apitest msvcrt kernel32 ntdll) -add_cd_file(TARGET dciman32_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET dciman32_apitest) diff --git a/rostests/apitests/dnsapi/CMakeLists.txt b/rostests/apitests/dnsapi/CMakeLists.txt index 9692c06a406..b7b27f95be0 100644 --- a/rostests/apitests/dnsapi/CMakeLists.txt +++ b/rostests/apitests/dnsapi/CMakeLists.txt @@ -7,4 +7,4 @@ add_executable(dnsapi_apitest ${SOURCE}) target_link_libraries(dnsapi_apitest wine) set_module_type(dnsapi_apitest win32cui) add_importlibs(dnsapi_apitest ws2_32 dnsapi iphlpapi msvcrt kernel32 ntdll) -add_cd_file(TARGET dnsapi_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET dnsapi_apitest) diff --git a/rostests/apitests/fltlib/CMakeLists.txt b/rostests/apitests/fltlib/CMakeLists.txt index db7d1ae55be..0df9d525ea3 100644 --- a/rostests/apitests/fltlib/CMakeLists.txt +++ b/rostests/apitests/fltlib/CMakeLists.txt @@ -13,4 +13,4 @@ list(APPEND SOURCE add_executable(fltlib_apitest ${SOURCE}) set_module_type(fltlib_apitest win32cui) add_importlibs(fltlib_apitest user32 msvcrt kernel32) -add_cd_file(TARGET fltlib_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET fltlib_apitest) diff --git a/rostests/apitests/gdi32/CMakeLists.txt b/rostests/apitests/gdi32/CMakeLists.txt index cbc617d410f..8e271640d5c 100644 --- a/rostests/apitests/gdi32/CMakeLists.txt +++ b/rostests/apitests/gdi32/CMakeLists.txt @@ -77,4 +77,4 @@ add_executable(gdi32_apitest ${SOURCE} resource.rc) target_link_libraries(gdi32_apitest ${PSEH_LIB} win32ksys) set_module_type(gdi32_apitest win32cui) add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32 ntdll) -add_cd_file(TARGET gdi32_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET gdi32_apitest) diff --git a/rostests/apitests/iphlpapi/CMakeLists.txt b/rostests/apitests/iphlpapi/CMakeLists.txt index 98881ac5dbb..c5ecc1457b4 100644 --- a/rostests/apitests/iphlpapi/CMakeLists.txt +++ b/rostests/apitests/iphlpapi/CMakeLists.txt @@ -9,4 +9,4 @@ add_executable(iphlpapi_apitest ${SOURCE}) target_link_libraries(iphlpapi_apitest wine ${PSEH_LIB}) set_module_type(iphlpapi_apitest win32cui) add_importlibs(iphlpapi_apitest iphlpapi advapi32 msvcrt kernel32 ntdll) -add_cd_file(TARGET iphlpapi_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET iphlpapi_apitest) diff --git a/rostests/apitests/kernel32/CMakeLists.txt b/rostests/apitests/kernel32/CMakeLists.txt index d371ca1052e..0a773946e65 100644 --- a/rostests/apitests/kernel32/CMakeLists.txt +++ b/rostests/apitests/kernel32/CMakeLists.txt @@ -25,7 +25,7 @@ target_link_libraries(kernel32_apitest wine ${PSEH_LIB}) set_module_type(kernel32_apitest win32cui) add_delay_importlibs(kernel32_apitest advapi32 shlwapi) add_importlibs(kernel32_apitest msvcrt kernel32 ntdll) -add_cd_file(TARGET kernel32_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET kernel32_apitest) list(APPEND MANIFEST_FILES classtest.manifest @@ -34,5 +34,5 @@ list(APPEND MANIFEST_FILES deptest.manifest) foreach(item ${MANIFEST_FILES}) - add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/bin FOR all) + add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}") endforeach(item) diff --git a/rostests/apitests/localspl/CMakeLists.txt b/rostests/apitests/localspl/CMakeLists.txt index e6c26f69282..2a1e3cd1ecc 100644 --- a/rostests/apitests/localspl/CMakeLists.txt +++ b/rostests/apitests/localspl/CMakeLists.txt @@ -10,4 +10,4 @@ add_executable(localspl_apitest ${SOURCE}) target_link_libraries(localspl_apitest wine ${PSEH_LIB}) set_module_type(localspl_apitest win32cui) add_importlibs(localspl_apitest advapi32 winspool msvcrt kernel32 ntdll) -add_cd_file(TARGET localspl_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET localspl_apitest) diff --git a/rostests/apitests/localspl/dll/CMakeLists.txt b/rostests/apitests/localspl/dll/CMakeLists.txt index 6505d6f9250..2ce4287611b 100644 --- a/rostests/apitests/localspl/dll/CMakeLists.txt +++ b/rostests/apitests/localspl/dll/CMakeLists.txt @@ -11,4 +11,4 @@ target_link_libraries(localspl_apitest.dll wine ${PSEH_LIB}) set_module_type(localspl_apitest.dll win32dll) add_importlibs(localspl_apitest.dll spoolss msvcrt kernel32 ntdll) set_target_properties(localspl_apitest.dll PROPERTIES SUFFIX "") -add_cd_file(TARGET localspl_apitest.dll DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET localspl_apitest.dll) diff --git a/rostests/apitests/msgina/CMakeLists.txt b/rostests/apitests/msgina/CMakeLists.txt index b742cff8533..524521db133 100644 --- a/rostests/apitests/msgina/CMakeLists.txt +++ b/rostests/apitests/msgina/CMakeLists.txt @@ -10,4 +10,4 @@ add_executable(msgina_apitest target_link_libraries(msgina_apitest wine uuid) set_module_type(msgina_apitest win32cui) add_importlibs(msgina_apitest msvcrt user32 kernel32) -add_cd_file(TARGET msgina_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET msgina_apitest) diff --git a/rostests/apitests/msvcrt/CMakeLists.txt b/rostests/apitests/msvcrt/CMakeLists.txt index fc853c776f8..8be74f05e29 100644 --- a/rostests/apitests/msvcrt/CMakeLists.txt +++ b/rostests/apitests/msvcrt/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(msvcrt_apitest ${SOURCE}) target_link_libraries(msvcrt_apitest wine) set_module_type(msvcrt_apitest win32cui) add_importlibs(msvcrt_apitest msvcrt kernel32) -add_cd_file(TARGET msvcrt_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET msvcrt_apitest) diff --git a/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt b/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt index 88b541e2e6e..a9197867637 100644 --- a/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt +++ b/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(CmdLineUtil CmdLineUtil.c) set_module_type(CmdLineUtil win32gui UNICODE) add_importlibs(CmdLineUtil msvcrt kernel32 ntdll) -add_cd_file(TARGET CmdLineUtil DESTINATION reactos/bin/testdata FOR all) +add_rostests_file(TARGET CmdLineUtil SUBDIR testdata) diff --git a/rostests/apitests/netshell/CMakeLists.txt b/rostests/apitests/netshell/CMakeLists.txt index 90788798d12..559c90aff2c 100644 --- a/rostests/apitests/netshell/CMakeLists.txt +++ b/rostests/apitests/netshell/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(netshell_apitest NcIsValidConnectionName.c testlist.c) set_module_type(netshell_apitest win32cui) add_importlibs(netshell_apitest msvcrt kernel32) -add_cd_file(TARGET netshell_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET netshell_apitest) diff --git a/rostests/apitests/ntdll/CMakeLists.txt b/rostests/apitests/ntdll/CMakeLists.txt index cfa5025dbaf..da8f158e323 100644 --- a/rostests/apitests/ntdll/CMakeLists.txt +++ b/rostests/apitests/ntdll/CMakeLists.txt @@ -63,4 +63,4 @@ if(NOT MSVC) set_source_files_properties(RtlGetFullPathName_UstrEx.c PROPERTIES COMPILE_FLAGS "-Wno-format") endif() -add_cd_file(TARGET ntdll_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET ntdll_apitest) diff --git a/rostests/apitests/ole32/CMakeLists.txt b/rostests/apitests/ole32/CMakeLists.txt index e6d08c801d1..4f6ad2dfdea 100644 --- a/rostests/apitests/ole32/CMakeLists.txt +++ b/rostests/apitests/ole32/CMakeLists.txt @@ -4,4 +4,4 @@ add_executable(ole32_apitest initializespy.cpp testlist.c) target_link_libraries(ole32_apitest wine uuid) set_module_type(ole32_apitest win32cui) add_importlibs(ole32_apitest user32 gdi32 shell32 ole32 shlwapi msvcrt kernel32) -add_cd_file(TARGET ole32_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET ole32_apitest) diff --git a/rostests/apitests/pefile/CMakeLists.txt b/rostests/apitests/pefile/CMakeLists.txt index 44297fad8db..ecdf6f68095 100644 --- a/rostests/apitests/pefile/CMakeLists.txt +++ b/rostests/apitests/pefile/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(pefile_apitest ntoskrnl.c testlist.c) set_module_type(pefile_apitest win32cui) add_importlibs(pefile_apitest msvcrt kernel32) -add_cd_file(TARGET pefile_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET pefile_apitest) diff --git a/rostests/apitests/powrprof/CMakeLists.txt b/rostests/apitests/powrprof/CMakeLists.txt index b589609444f..c5ffa440c54 100644 --- a/rostests/apitests/powrprof/CMakeLists.txt +++ b/rostests/apitests/powrprof/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(powrprof_apitest power.c testlist.c) set_module_type(powrprof_apitest win32cui) add_importlibs(powrprof_apitest advapi32 powrprof msvcrt kernel32) -add_cd_file(TARGET powrprof_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET powrprof_apitest) diff --git a/rostests/apitests/psapi/CMakeLists.txt b/rostests/apitests/psapi/CMakeLists.txt index b043d99b08e..901e5aed2a8 100644 --- a/rostests/apitests/psapi/CMakeLists.txt +++ b/rostests/apitests/psapi/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(psapi_apitest psapi.c testlist.c) set_module_type(psapi_apitest win32cui) add_importlibs(psapi_apitest psapi msvcrt kernel32) -add_cd_file(TARGET psapi_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET psapi_apitest) diff --git a/rostests/apitests/sdk/CMakeLists.txt b/rostests/apitests/sdk/CMakeLists.txt index a983e8b9e91..6b66ca8d31c 100644 --- a/rostests/apitests/sdk/CMakeLists.txt +++ b/rostests/apitests/sdk/CMakeLists.txt @@ -4,4 +4,4 @@ set_module_type(sdk_apitest win32cui) target_link_libraries(sdk_apitest ${PSEH_LIB}) add_importlibs(sdk_apitest msvcrt kernel32 ntdll) add_delay_importlibs(sdk_apitest winmm version dbghelp shlwapi sfc_os imagehlp) -add_cd_file(TARGET sdk_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET sdk_apitest) diff --git a/rostests/apitests/setupapi/CMakeLists.txt b/rostests/apitests/setupapi/CMakeLists.txt index 3102da4c1dc..a6e688b4022 100644 --- a/rostests/apitests/setupapi/CMakeLists.txt +++ b/rostests/apitests/setupapi/CMakeLists.txt @@ -8,4 +8,4 @@ list(APPEND SOURCE add_executable(setupapi_apitest ${SOURCE}) set_module_type(setupapi_apitest win32cui) add_importlibs(setupapi_apitest advapi32 setupapi user32 msvcrt kernel32) -add_cd_file(TARGET setupapi_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET setupapi_apitest) diff --git a/rostests/apitests/shell32/CMakeLists.txt b/rostests/apitests/shell32/CMakeLists.txt index 47ff34ab1b5..a9b8bfa0e8e 100644 --- a/rostests/apitests/shell32/CMakeLists.txt +++ b/rostests/apitests/shell32/CMakeLists.txt @@ -16,4 +16,4 @@ add_executable(shell32_apitest target_link_libraries(shell32_apitest wine uuid ${PSEH_LIB}) set_module_type(shell32_apitest win32cui) add_importlibs(shell32_apitest user32 gdi32 shell32 ole32 oleaut32 advapi32 shlwapi msvcrt kernel32 ntdll) -add_cd_file(TARGET shell32_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET shell32_apitest) diff --git a/rostests/apitests/spoolss/CMakeLists.txt b/rostests/apitests/spoolss/CMakeLists.txt index 35e37f71867..438e1886fca 100644 --- a/rostests/apitests/spoolss/CMakeLists.txt +++ b/rostests/apitests/spoolss/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(spoolss_apitest ${SOURCE}) target_link_libraries(spoolss_apitest wine ${PSEH_LIB}) set_module_type(spoolss_apitest win32cui) add_importlibs(spoolss_apitest spoolss msvcrt kernel32 ntdll) -add_cd_file(TARGET spoolss_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET spoolss_apitest) diff --git a/rostests/apitests/user32/CMakeLists.txt b/rostests/apitests/user32/CMakeLists.txt index 82714bba8d6..3abd104e115 100644 --- a/rostests/apitests/user32/CMakeLists.txt +++ b/rostests/apitests/user32/CMakeLists.txt @@ -42,4 +42,4 @@ add_executable(user32_apitest ${SOURCE}) target_link_libraries(user32_apitest wine ${PSEH_LIB}) set_module_type(user32_apitest win32cui) add_importlibs(user32_apitest advapi32 gdi32 user32 msvcrt kernel32 ntdll) -add_cd_file(TARGET user32_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET user32_apitest) diff --git a/rostests/apitests/user32_dynamic/CMakeLists.txt b/rostests/apitests/user32_dynamic/CMakeLists.txt index 496e5eac0c3..841480be21b 100644 --- a/rostests/apitests/user32_dynamic/CMakeLists.txt +++ b/rostests/apitests/user32_dynamic/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(user32_dynamic_apitest load.c testlist.c) set_module_type(user32_dynamic_apitest win32cui) add_importlibs(user32_dynamic_apitest msvcrt kernel32) -add_cd_file(TARGET user32_dynamic_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET user32_dynamic_apitest) diff --git a/rostests/apitests/userenv/CMakeLists.txt b/rostests/apitests/userenv/CMakeLists.txt index 2b5523c123b..a66cdf08016 100644 --- a/rostests/apitests/userenv/CMakeLists.txt +++ b/rostests/apitests/userenv/CMakeLists.txt @@ -7,4 +7,4 @@ add_executable(userenv_apitest ${SOURCE}) target_link_libraries(userenv_apitest wine ${PSEH_LIB}) set_module_type(userenv_apitest win32cui) add_importlibs(userenv_apitest userenv advapi32 msvcrt kernel32) -add_cd_file(TARGET userenv_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET userenv_apitest) diff --git a/rostests/apitests/win32kdll/win32kdll_ros/CMakeLists.txt b/rostests/apitests/win32kdll/win32kdll_ros/CMakeLists.txt index 4a8983c9db4..55f71e285aa 100644 --- a/rostests/apitests/win32kdll/win32kdll_ros/CMakeLists.txt +++ b/rostests/apitests/win32kdll/win32kdll_ros/CMakeLists.txt @@ -11,4 +11,4 @@ add_library(win32kdll SHARED set_module_type(win32kdll module) add_dependencies(win32kdll psdk) -add_cd_file(TARGET win32kdll DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET win32kdll) diff --git a/rostests/apitests/win32nt/CMakeLists.txt b/rostests/apitests/win32nt/CMakeLists.txt index 79add7f6d3e..63a5fc25512 100644 --- a/rostests/apitests/win32nt/CMakeLists.txt +++ b/rostests/apitests/win32nt/CMakeLists.txt @@ -78,4 +78,4 @@ add_importlibs(win32knt_apitest ntdll) add_dependencies(win32knt_apitest xdk) -add_cd_file(TARGET win32knt_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET win32knt_apitest) diff --git a/rostests/apitests/winhttp/CMakeLists.txt b/rostests/apitests/winhttp/CMakeLists.txt index 74058d6caf8..a8b00d9f33a 100644 --- a/rostests/apitests/winhttp/CMakeLists.txt +++ b/rostests/apitests/winhttp/CMakeLists.txt @@ -4,4 +4,4 @@ target_link_libraries(winhttp_apitest wine) set_module_type(winhttp_apitest win32cui) #add_delay_importlibs(winhttp_apitest winhttp) add_importlibs(winhttp_apitest msvcrt kernel32 ntdll) -add_cd_file(TARGET winhttp_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET winhttp_apitest) diff --git a/rostests/apitests/wininet/CMakeLists.txt b/rostests/apitests/wininet/CMakeLists.txt index 68e542397e7..fb18c91ac17 100644 --- a/rostests/apitests/wininet/CMakeLists.txt +++ b/rostests/apitests/wininet/CMakeLists.txt @@ -4,4 +4,4 @@ target_link_libraries(wininet_apitest wine) set_module_type(wininet_apitest win32cui) #add_delay_importlibs(wininet_apitest wininet) add_importlibs(wininet_apitest msvcrt kernel32 ntdll) -add_cd_file(TARGET wininet_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET wininet_apitest) diff --git a/rostests/apitests/winprint/CMakeLists.txt b/rostests/apitests/winprint/CMakeLists.txt index d9fd329bbec..e919806717c 100644 --- a/rostests/apitests/winprint/CMakeLists.txt +++ b/rostests/apitests/winprint/CMakeLists.txt @@ -8,4 +8,4 @@ add_executable(winprint_apitest ${SOURCE}) target_link_libraries(winprint_apitest wine ${PSEH_LIB}) set_module_type(winprint_apitest win32cui) add_importlibs(winprint_apitest winspool msvcrt kernel32 ntdll) -add_cd_file(TARGET winprint_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET winprint_apitest) diff --git a/rostests/apitests/winspool/CMakeLists.txt b/rostests/apitests/winspool/CMakeLists.txt index c1c7e6ac2aa..9c0c77c2ffb 100644 --- a/rostests/apitests/winspool/CMakeLists.txt +++ b/rostests/apitests/winspool/CMakeLists.txt @@ -13,4 +13,4 @@ add_executable(winspool_apitest ${SOURCE}) target_link_libraries(winspool_apitest wine ${PSEH_LIB}) set_module_type(winspool_apitest win32cui) add_importlibs(winspool_apitest winspool msvcrt kernel32 ntdll) -add_cd_file(TARGET winspool_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET winspool_apitest) diff --git a/rostests/apitests/wlanapi/CMakeLists.txt b/rostests/apitests/wlanapi/CMakeLists.txt index 81906f26cf2..787272492aa 100644 --- a/rostests/apitests/wlanapi/CMakeLists.txt +++ b/rostests/apitests/wlanapi/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(wlanapi_apitest wlanapi.c testlist.c) set_module_type(wlanapi_apitest win32cui) add_importlibs(wlanapi_apitest wlanapi msvcrt kernel32) -add_cd_file(TARGET wlanapi_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET wlanapi_apitest) diff --git a/rostests/apitests/ws2_32/CMakeLists.txt b/rostests/apitests/ws2_32/CMakeLists.txt index f3e95495881..d501b5cd721 100644 --- a/rostests/apitests/ws2_32/CMakeLists.txt +++ b/rostests/apitests/ws2_32/CMakeLists.txt @@ -20,4 +20,4 @@ add_executable(ws2_32_apitest ${SOURCE}) target_link_libraries(ws2_32_apitest wine ${PSEH_LIB}) set_module_type(ws2_32_apitest win32cui) add_importlibs(ws2_32_apitest ws2_32 msvcrt iphlpapi kernel32 ntdll) -add_cd_file(TARGET ws2_32_apitest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET ws2_32_apitest) diff --git a/rostests/drivers/tcpip/CMakeLists.txt b/rostests/drivers/tcpip/CMakeLists.txt index b20297133e9..4f5aeb6e093 100644 --- a/rostests/drivers/tcpip/CMakeLists.txt +++ b/rostests/drivers/tcpip/CMakeLists.txt @@ -10,4 +10,4 @@ add_executable(tcpip_drvtest ${SOURCE}) target_link_libraries(tcpip_drvtest wine) set_module_type(tcpip_drvtest win32cui) add_importlibs(tcpip_drvtest msvcrt kernel32 ntdll) -add_cd_file(TARGET tcpip_drvtest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET tcpip_drvtest) diff --git a/rostests/kmtests/CMakeLists.txt b/rostests/kmtests/CMakeLists.txt index a9e94802c00..962bae5d915 100644 --- a/rostests/kmtests/CMakeLists.txt +++ b/rostests/kmtests/CMakeLists.txt @@ -101,7 +101,7 @@ add_importlibs(kmtest_drv ntoskrnl hal) add_dependencies(kmtest_drv bugcodes xdk) add_target_compile_definitions(kmtest_drv KMT_KERNEL_MODE NTDDI_VERSION=NTDDI_WS03SP1) #add_pch(kmtest_drv include/kmt_test.h) -add_cd_file(TARGET kmtest_drv DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET kmtest_drv) add_library(kmtest_printf kmtest_drv/printf_stubs.c @@ -141,7 +141,7 @@ add_importlibs(kmtest advapi32 ws2_32 msvcrt kernel32 ntdll) add_target_compile_definitions(kmtest KMT_USER_MODE) #add_pch(kmtest include/kmt_test.h) set_target_properties(kmtest PROPERTIES OUTPUT_NAME "kmtest_") -add_cd_file(TARGET kmtest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET kmtest) # # Group targets diff --git a/rostests/kmtests/example/CMakeLists.txt b/rostests/kmtests/example/CMakeLists.txt index 3f280bef3fa..e39ee3dcaea 100644 --- a/rostests/kmtests/example/CMakeLists.txt +++ b/rostests/kmtests/example/CMakeLists.txt @@ -11,4 +11,4 @@ target_link_libraries(example_drv kmtest_printf ${PSEH_LIB}) add_importlibs(example_drv ntoskrnl hal) add_target_compile_definitions(example_drv KMT_STANDALONE_DRIVER) #add_pch(example_drv ../include/kmt_test.h) -add_cd_file(TARGET example_drv DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET example_drv) diff --git a/rostests/kmtests/kernel32/CMakeLists.txt b/rostests/kmtests/kernel32/CMakeLists.txt index 402515600a3..8d0b2ec9674 100644 --- a/rostests/kmtests/kernel32/CMakeLists.txt +++ b/rostests/kmtests/kernel32/CMakeLists.txt @@ -11,4 +11,4 @@ target_link_libraries(findfile_drv kmtest_printf ${PSEH_LIB}) add_importlibs(findfile_drv ntoskrnl hal) add_target_compile_definitions(findfile_drv KMT_STANDALONE_DRIVER) #add_pch(findfile_drv ../include/kmt_test.h) -add_cd_file(TARGET findfile_drv DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET findfile_drv) diff --git a/rostests/kmtests/ntos_cc/CMakeLists.txt b/rostests/kmtests/ntos_cc/CMakeLists.txt index 6d0926242e8..7155dce0be6 100644 --- a/rostests/kmtests/ntos_cc/CMakeLists.txt +++ b/rostests/kmtests/ntos_cc/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(cccopyread_drv kmtest_printf ${PSEH_LIB}) add_importlibs(cccopyread_drv ntoskrnl hal) add_target_compile_definitions(cccopyread_drv KMT_STANDALONE_DRIVER) #add_pch(cccopyread_drv ../include/kmt_test.h) -add_cd_file(TARGET cccopyread_drv DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET cccopyread_drv) diff --git a/rostests/kmtests/ntos_io/CMakeLists.txt b/rostests/kmtests/ntos_io/CMakeLists.txt index 2b3fc07e19c..76edbd5bf91 100644 --- a/rostests/kmtests/ntos_io/CMakeLists.txt +++ b/rostests/kmtests/ntos_io/CMakeLists.txt @@ -14,7 +14,7 @@ target_link_libraries(iocreatefile_drv kmtest_printf ${PSEH_LIB}) add_importlibs(iocreatefile_drv ntoskrnl hal) add_target_compile_definitions(iocreatefile_drv KMT_STANDALONE_DRIVER) #add_pch(iocreatefile_drv ../include/kmt_test.h) -add_cd_file(TARGET iocreatefile_drv DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET iocreatefile_drv) # # IoDeviceObject @@ -29,7 +29,7 @@ target_link_libraries(iodeviceobject_drv kmtest_printf ${PSEH_LIB}) add_importlibs(iodeviceobject_drv ntoskrnl hal) add_target_compile_definitions(iodeviceobject_drv KMT_STANDALONE_DRIVER) #add_pch(iodeviceobject_drv ../include/kmt_test.h) -add_cd_file(TARGET iodeviceobject_drv DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET iodeviceobject_drv) # # IoHelper @@ -44,7 +44,7 @@ target_link_libraries(iohelper_drv kmtest_printf ${PSEH_LIB}) add_importlibs(iohelper_drv ntoskrnl hal) add_target_compile_definitions(iohelper_drv KMT_STANDALONE_DRIVER) #add_pch(iohelper_drv ../include/kmt_test.h) -add_cd_file(TARGET iohelper_drv DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET iohelper_drv) # # IoReadWrite @@ -59,4 +59,4 @@ target_link_libraries(ioreadwrite_drv kmtest_printf ${PSEH_LIB}) add_importlibs(ioreadwrite_drv ntoskrnl hal) add_target_compile_definitions(ioreadwrite_drv KMT_STANDALONE_DRIVER) #add_pch(ioreadwrite_drv ../include/kmt_test.h) -add_cd_file(TARGET ioreadwrite_drv DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET ioreadwrite_drv) diff --git a/rostests/kmtests/ntos_mm/CMakeLists.txt b/rostests/kmtests/ntos_mm/CMakeLists.txt index 6a899cf3e14..b0356e63674 100644 --- a/rostests/kmtests/ntos_mm/CMakeLists.txt +++ b/rostests/kmtests/ntos_mm/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(ntcreatesection_drv kmtest_printf ${PSEH_LIB}) add_importlibs(ntcreatesection_drv ntoskrnl hal) add_target_compile_definitions(ntcreatesection_drv KMT_STANDALONE_DRIVER) #add_pch(ntcreatesection_drv ../include/kmt_test.h) -add_cd_file(TARGET ntcreatesection_drv DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET ntcreatesection_drv) diff --git a/rostests/kmtests/ntos_po/CMakeLists.txt b/rostests/kmtests/ntos_po/CMakeLists.txt index e6f0745a4af..c5a6fef4af2 100644 --- a/rostests/kmtests/ntos_po/CMakeLists.txt +++ b/rostests/kmtests/ntos_po/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(poirp_drv kmtest_printf ${PSEH_LIB}) add_importlibs(poirp_drv ntoskrnl hal) add_target_compile_definitions(poirp_drv KMT_STANDALONE_DRIVER) #add_pch(poirp_drv ../include/kmt_test.h) -add_cd_file(TARGET poirp_drv DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET poirp_drv) diff --git a/rostests/kmtests/tcpip/CMakeLists.txt b/rostests/kmtests/tcpip/CMakeLists.txt index 33614812352..4fa55c2e075 100644 --- a/rostests/kmtests/tcpip/CMakeLists.txt +++ b/rostests/kmtests/tcpip/CMakeLists.txt @@ -13,4 +13,4 @@ target_link_libraries(tcpip_drv kmtest_printf ${PSEH_LIB}) add_importlibs(tcpip_drv ntoskrnl hal) add_target_compile_definitions(tcpip_drv KMT_STANDALONE_DRIVER) #add_pch(example_drv ../include/kmt_test.h) -add_cd_file(TARGET tcpip_drv DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET tcpip_drv) diff --git a/rostests/tests/np_enum/CMakeLists.txt b/rostests/tests/np_enum/CMakeLists.txt index 8f4d4a8e8cf..8e744aabb37 100644 --- a/rostests/tests/np_enum/CMakeLists.txt +++ b/rostests/tests/np_enum/CMakeLists.txt @@ -1,4 +1,4 @@ add_executable(np_enum np_enum.c) set_module_type(np_enum win32cui UNICODE) add_importlibs(np_enum msvcrt kernel32 mpr) -add_cd_file(TARGET np_enum DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET np_enum) diff --git a/rostests/tests/parttest/CMakeLists.txt b/rostests/tests/parttest/CMakeLists.txt index 46f40295cff..1dfd45393a7 100644 --- a/rostests/tests/parttest/CMakeLists.txt +++ b/rostests/tests/parttest/CMakeLists.txt @@ -1,4 +1,4 @@ add_executable(parttest parttest.c) set_module_type(parttest win32cui) add_importlibs(parttest ntdll msvcrt kernel32) -add_cd_file(TARGET parttest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET parttest) diff --git a/rostests/tests/pseh2/CMakeLists.txt b/rostests/tests/pseh2/CMakeLists.txt index 6c551df3710..e737a974a09 100644 --- a/rostests/tests/pseh2/CMakeLists.txt +++ b/rostests/tests/pseh2/CMakeLists.txt @@ -3,7 +3,7 @@ add_executable(pseh2_test psehtest.c psehtest2.c) target_link_libraries(pseh2_test wine ${PSEH_LIB}) set_module_type(pseh2_test win32cui) add_importlibs(pseh2_test msvcrt kernel32 ntdll) -add_cd_file(TARGET pseh2_test DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET pseh2_test) if(NOT MSVC) add_target_compile_flags(pseh2_test "-Wno-format") @@ -14,7 +14,7 @@ add_executable(pseh2_test_cpp psehtest_cpp.cpp psehtest2.c) target_link_libraries(pseh2_test_cpp wine ${PSEH_LIB}) set_module_type(pseh2_test_cpp win32cui) add_importlibs(pseh2_test_cpp msvcrt kernel32 ntdll) -add_cd_file(TARGET pseh2_test_cpp DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET pseh2_test_cpp) if(NOT MSVC) add_target_compile_flags(pseh2_test_cpp "-Wno-format") diff --git a/rostests/win32/advapi32/eventlog/CMakeLists.txt b/rostests/win32/advapi32/eventlog/CMakeLists.txt index 34e0dd884cb..2220b951987 100644 --- a/rostests/win32/advapi32/eventlog/CMakeLists.txt +++ b/rostests/win32/advapi32/eventlog/CMakeLists.txt @@ -8,10 +8,10 @@ add_library(MyEventProvider_dll SHARED ${CMAKE_CURRENT_BINARY_DIR}/MyEventProvid add_dependencies(MyEventProvider_dll MyEventProvider) set_module_type(MyEventProvider_dll module UNICODE) set_target_properties(MyEventProvider_dll PROPERTIES OUTPUT_NAME "MyEventProvider") -add_cd_file(TARGET MyEventProvider_dll DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET MyEventProvider_dll) add_executable(evtlogtest EvtLogTest.c) set_module_type(evtlogtest win32cui UNICODE) add_dependencies(evtlogtest MyEventProvider MyEventProvider_dll) add_importlibs(evtlogtest advapi32 msvcrt kernel32) -add_cd_file(TARGET evtlogtest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET evtlogtest) diff --git a/rostests/win32/fs/tunneltest/CMakeLists.txt b/rostests/win32/fs/tunneltest/CMakeLists.txt index fe46d2fc1e2..8ab41f953d3 100644 --- a/rostests/win32/fs/tunneltest/CMakeLists.txt +++ b/rostests/win32/fs/tunneltest/CMakeLists.txt @@ -5,4 +5,4 @@ list(APPEND SOURCE add_executable(tunneltest ${SOURCE}) set_module_type(tunneltest win32cui UNICODE) add_importlibs(tunneltest msvcrt kernel32 ntdll) -add_cd_file(TARGET tunneltest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET tunneltest) diff --git a/rostests/win32/kernel32/notificationtest/CMakeLists.txt b/rostests/win32/kernel32/notificationtest/CMakeLists.txt index 79caf133740..da79cdfc320 100644 --- a/rostests/win32/kernel32/notificationtest/CMakeLists.txt +++ b/rostests/win32/kernel32/notificationtest/CMakeLists.txt @@ -6,4 +6,4 @@ add_executable(notificationtest ${SOURCE}) target_link_libraries(notificationtest wine ${PSEH_LIB}) set_module_type(notificationtest win32cui) add_importlibs(notificationtest gdi32 user32 shlwapi msvcrt kernel32 ntdll) -add_cd_file(TARGET notificationtest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET notificationtest) diff --git a/rostests/win32/user32/paintdesktop/CMakeLists.txt b/rostests/win32/user32/paintdesktop/CMakeLists.txt index ebf9ecd821e..3c5172571e0 100644 --- a/rostests/win32/user32/paintdesktop/CMakeLists.txt +++ b/rostests/win32/user32/paintdesktop/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(paintdesktop PaintDesktop.c) set_module_type(paintdesktop win32gui UNICODE) add_importlibs(paintdesktop user32 msvcrt kernel32) -add_cd_file(TARGET paintdesktop DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET paintdesktop) diff --git a/rostests/win32/user32/sysicon/CMakeLists.txt b/rostests/win32/user32/sysicon/CMakeLists.txt index 25741349108..054734c3734 100644 --- a/rostests/win32/user32/sysicon/CMakeLists.txt +++ b/rostests/win32/user32/sysicon/CMakeLists.txt @@ -7,4 +7,4 @@ add_executable(sysicon ${SOURCE}) target_link_libraries(sysicon ${PSEH_LIB}) set_module_type(sysicon win32gui UNICODE) add_importlibs(sysicon gdi32 user32 msvcrt kernel32) -add_cd_file(TARGET sysicon DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET sysicon) diff --git a/rostests/winetests/advapi32/CMakeLists.txt b/rostests/winetests/advapi32/CMakeLists.txt index 8d5e3ded84c..d6958f4c634 100644 --- a/rostests/winetests/advapi32/CMakeLists.txt +++ b/rostests/winetests/advapi32/CMakeLists.txt @@ -23,4 +23,4 @@ endif() set_module_type(advapi32_winetest win32cui) add_importlibs(advapi32_winetest advapi32 ole32 msvcrt kernel32 ntdll) -add_cd_file(TARGET advapi32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET advapi32_winetest) diff --git a/rostests/winetests/advpack/CMakeLists.txt b/rostests/winetests/advpack/CMakeLists.txt index c47a91e0a17..c6d489e0c8b 100644 --- a/rostests/winetests/advpack/CMakeLists.txt +++ b/rostests/winetests/advpack/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(advpack_winetest ${SOURCE}) target_link_libraries(advpack_winetest) set_module_type(advpack_winetest win32cui) add_importlibs(advpack_winetest advpack cabinet advapi32 msvcrt kernel32) -add_cd_file(TARGET advpack_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET advpack_winetest) diff --git a/rostests/winetests/amstream/CMakeLists.txt b/rostests/winetests/amstream/CMakeLists.txt index fa13a2887b1..f7808e7a204 100644 --- a/rostests/winetests/amstream/CMakeLists.txt +++ b/rostests/winetests/amstream/CMakeLists.txt @@ -3,4 +3,4 @@ add_executable(amstream_winetest amstream.c testlist.c) target_link_libraries(amstream_winetest uuid) set_module_type(amstream_winetest win32cui) add_importlibs(amstream_winetest ole32 user32 ddraw msvcrt kernel32) -add_cd_file(TARGET amstream_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET amstream_winetest) diff --git a/rostests/winetests/atl/CMakeLists.txt b/rostests/winetests/atl/CMakeLists.txt index 8c7d1518ab9..47c0dc45d51 100644 --- a/rostests/winetests/atl/CMakeLists.txt +++ b/rostests/winetests/atl/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(atl_winetest ${SOURCE}) target_link_libraries(atl_winetest wine uuid) set_module_type(atl_winetest win32cui) add_importlibs(atl_winetest ole32 user32 atl advapi32 msvcrt kernel32) -add_cd_file(TARGET atl_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET atl_winetest) diff --git a/rostests/winetests/atl100/CMakeLists.txt b/rostests/winetests/atl100/CMakeLists.txt index f28ad0165d4..4029e21573d 100644 --- a/rostests/winetests/atl100/CMakeLists.txt +++ b/rostests/winetests/atl100/CMakeLists.txt @@ -6,4 +6,4 @@ add_executable(atl100_winetest ${SOURCE}) target_link_libraries(atl100_winetest uuid) set_module_type(atl100_winetest win32cui) add_importlibs(atl100_winetest atl100 oleaut32 ole32 advapi32 user32 msvcrt kernel32) -add_cd_file(TARGET atl100_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET atl100_winetest) diff --git a/rostests/winetests/atl80/CMakeLists.txt b/rostests/winetests/atl80/CMakeLists.txt index 2e19963871a..55b12b12d05 100644 --- a/rostests/winetests/atl80/CMakeLists.txt +++ b/rostests/winetests/atl80/CMakeLists.txt @@ -5,4 +5,4 @@ add_executable(atl80_winetest ${SOURCE} atl80.rc) target_link_libraries(atl80_winetest uuid) set_module_type(atl80_winetest win32cui) add_importlibs(atl80_winetest atl80 oleaut32 ole32 advapi32 user32 msvcrt kernel32) -add_cd_file(TARGET atl80_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET atl80_winetest) diff --git a/rostests/winetests/avifil32/CMakeLists.txt b/rostests/winetests/avifil32/CMakeLists.txt index 516cb101ecc..7a1e0bd81a2 100644 --- a/rostests/winetests/avifil32/CMakeLists.txt +++ b/rostests/winetests/avifil32/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(avifil32_winetest api.c testlist.c) set_module_type(avifil32_winetest win32cui) add_importlibs(avifil32_winetest avifil32 ole32 msvcrt kernel32) -add_cd_file(TARGET avifil32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET avifil32_winetest) diff --git a/rostests/winetests/bcrypt/CMakeLists.txt b/rostests/winetests/bcrypt/CMakeLists.txt index 6f1dc4076bd..2daa27cdb16 100644 --- a/rostests/winetests/bcrypt/CMakeLists.txt +++ b/rostests/winetests/bcrypt/CMakeLists.txt @@ -3,4 +3,4 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_executable(bcrypt_winetest bcrypt.c testlist.c) set_module_type(bcrypt_winetest win32cui) add_importlibs(bcrypt_winetest bcrypt advapi32 user32 msvcrt kernel32) -add_cd_file(TARGET bcrypt_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET bcrypt_winetest) diff --git a/rostests/winetests/browseui/CMakeLists.txt b/rostests/winetests/browseui/CMakeLists.txt index c9a52246fcc..8bfd1e5cf50 100644 --- a/rostests/winetests/browseui/CMakeLists.txt +++ b/rostests/winetests/browseui/CMakeLists.txt @@ -3,4 +3,4 @@ add_executable(browseui_winetest autocomplete.c progressdlg.c testlist.c) target_link_libraries(browseui_winetest uuid) set_module_type(browseui_winetest win32cui) add_importlibs(browseui_winetest ole32 msvcrt kernel32) -add_cd_file(TARGET browseui_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET browseui_winetest) diff --git a/rostests/winetests/cabinet/CMakeLists.txt b/rostests/winetests/cabinet/CMakeLists.txt index faab5d8fd6d..58faf799f27 100644 --- a/rostests/winetests/cabinet/CMakeLists.txt +++ b/rostests/winetests/cabinet/CMakeLists.txt @@ -3,4 +3,4 @@ add_definitions(-DUSE_WINE_TODOS) add_executable(cabinet_winetest extract.c fdi.c testlist.c) set_module_type(cabinet_winetest win32cui) add_importlibs(cabinet_winetest cabinet msvcrt kernel32) -add_cd_file(TARGET cabinet_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET cabinet_winetest) diff --git a/rostests/winetests/cmd/CMakeLists.txt b/rostests/winetests/cmd/CMakeLists.txt index 9a3e90ee857..eb5f03615b4 100644 --- a/rostests/winetests/cmd/CMakeLists.txt +++ b/rostests/winetests/cmd/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(cmd_winetest batch.c testlist.c rsrc.rc) set_module_type(cmd_winetest win32cui) add_importlibs(cmd_winetest msvcrt kernel32) -add_cd_file(TARGET cmd_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET cmd_winetest) diff --git a/rostests/winetests/comcat/CMakeLists.txt b/rostests/winetests/comcat/CMakeLists.txt index 264320d3926..d9d8b7d0f3d 100644 --- a/rostests/winetests/comcat/CMakeLists.txt +++ b/rostests/winetests/comcat/CMakeLists.txt @@ -3,4 +3,4 @@ add_executable(comcat_winetest comcat.c testlist.c) target_link_libraries(comcat_winetest uuid) set_module_type(comcat_winetest win32cui) add_importlibs(comcat_winetest ole32 advapi32 msvcrt kernel32) -add_cd_file(TARGET comcat_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET comcat_winetest) diff --git a/rostests/winetests/comctl32/CMakeLists.txt b/rostests/winetests/comctl32/CMakeLists.txt index 2920bf559c5..006fadc66a8 100644 --- a/rostests/winetests/comctl32/CMakeLists.txt +++ b/rostests/winetests/comctl32/CMakeLists.txt @@ -34,7 +34,7 @@ list(APPEND SOURCE add_executable(comctl32_winetest ${SOURCE} rsrc.rc) set_module_type(comctl32_winetest win32cui) add_importlibs(comctl32_winetest comctl32 ole32 user32 gdi32 advapi32 msvcrt kernel32) -add_cd_file(TARGET comctl32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET comctl32_winetest) if(NOT MSVC) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 diff --git a/rostests/winetests/comdlg32/CMakeLists.txt b/rostests/winetests/comdlg32/CMakeLists.txt index 9fae8c0f51a..b61e43056cd 100644 --- a/rostests/winetests/comdlg32/CMakeLists.txt +++ b/rostests/winetests/comdlg32/CMakeLists.txt @@ -13,4 +13,4 @@ add_executable(comdlg32_winetest ${SOURCE} rsrc.rc) target_link_libraries(comdlg32_winetest uuid) set_module_type(comdlg32_winetest win32cui) add_importlibs(comdlg32_winetest comdlg32 winspool user32 gdi32 ole32 shell32 msvcrt kernel32) -add_cd_file(TARGET comdlg32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET comdlg32_winetest) diff --git a/rostests/winetests/credui/CMakeLists.txt b/rostests/winetests/credui/CMakeLists.txt index c852aa99272..0bac90fd4db 100644 --- a/rostests/winetests/credui/CMakeLists.txt +++ b/rostests/winetests/credui/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(credui_winetest credui.c testlist.c) set_module_type(credui_winetest win32cui) add_importlibs(credui_winetest credui msvcrt kernel32) -add_cd_file(TARGET credui_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET credui_winetest) diff --git a/rostests/winetests/crypt32/CMakeLists.txt b/rostests/winetests/crypt32/CMakeLists.txt index a332f06b5e7..6211969dd38 100644 --- a/rostests/winetests/crypt32/CMakeLists.txt +++ b/rostests/winetests/crypt32/CMakeLists.txt @@ -22,4 +22,4 @@ list(APPEND SOURCE add_executable(crypt32_winetest ${SOURCE}) set_module_type(crypt32_winetest win32cui) add_importlibs(crypt32_winetest crypt32 advapi32 user32 shlwapi shell32 msvcrt kernel32) -add_cd_file(TARGET crypt32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET crypt32_winetest) diff --git a/rostests/winetests/cryptnet/CMakeLists.txt b/rostests/winetests/cryptnet/CMakeLists.txt index 3d1f00f60ff..a44b6d678c7 100644 --- a/rostests/winetests/cryptnet/CMakeLists.txt +++ b/rostests/winetests/cryptnet/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(cryptnet_winetest cryptnet.c testlist.c) set_module_type(cryptnet_winetest win32cui) add_importlibs(cryptnet_winetest cryptnet crypt32 msvcrt kernel32) -add_cd_file(TARGET cryptnet_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET cryptnet_winetest) diff --git a/rostests/winetests/cryptui/CMakeLists.txt b/rostests/winetests/cryptui/CMakeLists.txt index a7a6d94c708..3549322e0b9 100644 --- a/rostests/winetests/cryptui/CMakeLists.txt +++ b/rostests/winetests/cryptui/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(cryptui_winetest cryptui.c testlist.c) set_module_type(cryptui_winetest win32cui) add_importlibs(cryptui_winetest cryptui crypt32 user32 msvcrt kernel32) -add_cd_file(TARGET cryptui_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET cryptui_winetest) diff --git a/rostests/winetests/d3drm/CMakeLists.txt b/rostests/winetests/d3drm/CMakeLists.txt index 10eac363cce..b9a867bcaed 100644 --- a/rostests/winetests/d3drm/CMakeLists.txt +++ b/rostests/winetests/d3drm/CMakeLists.txt @@ -4,4 +4,4 @@ add_executable(d3drm_winetest d3drm.c vector.c testlist.c) target_link_libraries(d3drm_winetest uuid dxguid) set_module_type(d3drm_winetest win32cui) add_importlibs(d3drm_winetest ddraw d3drm user32 msvcrt kernel32) -add_cd_file(TARGET d3drm_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET d3drm_winetest) diff --git a/rostests/winetests/devenum/CMakeLists.txt b/rostests/winetests/devenum/CMakeLists.txt index 74108e4c9df..acdbbb123d6 100644 --- a/rostests/winetests/devenum/CMakeLists.txt +++ b/rostests/winetests/devenum/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(devenum_winetest devenum.c testlist.c) set_module_type(devenum_winetest win32cui) add_importlibs(devenum_winetest oleaut32 ole32 msvcrt kernel32) -add_cd_file(TARGET devenum_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET devenum_winetest) diff --git a/rostests/winetests/dinput/CMakeLists.txt b/rostests/winetests/dinput/CMakeLists.txt index ee20c59d8a9..72cc31fb0d8 100644 --- a/rostests/winetests/dinput/CMakeLists.txt +++ b/rostests/winetests/dinput/CMakeLists.txt @@ -12,4 +12,4 @@ add_executable(dinput_winetest target_link_libraries(dinput_winetest dinput_data_formats) set_module_type(dinput_winetest win32cui) add_importlibs(dinput_winetest dinput ole32 user32 msvcrt kernel32) -add_cd_file(TARGET dinput_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET dinput_winetest) diff --git a/rostests/winetests/dnsapi/CMakeLists.txt b/rostests/winetests/dnsapi/CMakeLists.txt index cf5176d1521..a662f1f4c77 100644 --- a/rostests/winetests/dnsapi/CMakeLists.txt +++ b/rostests/winetests/dnsapi/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(dnsapi_winetest name.c record.c testlist.c) set_module_type(dnsapi_winetest win32cui) add_importlibs(dnsapi_winetest dnsapi msvcrt kernel32) -add_cd_file(TARGET dnsapi_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET dnsapi_winetest) diff --git a/rostests/winetests/dplayx/CMakeLists.txt b/rostests/winetests/dplayx/CMakeLists.txt index c51fde57461..d9570e6e346 100644 --- a/rostests/winetests/dplayx/CMakeLists.txt +++ b/rostests/winetests/dplayx/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(dplayx_winetest dplayx.c testlist.c) set_module_type(dplayx_winetest win32cui) add_importlibs(dplayx_winetest dplayx ole32 msvcrt kernel32) -add_cd_file(TARGET dplayx_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET dplayx_winetest) diff --git a/rostests/winetests/dsound/CMakeLists.txt b/rostests/winetests/dsound/CMakeLists.txt index eea22f5528a..7c51bef7617 100644 --- a/rostests/winetests/dsound/CMakeLists.txt +++ b/rostests/winetests/dsound/CMakeLists.txt @@ -13,4 +13,4 @@ add_executable(dsound_winetest ${SOURCE}) target_link_libraries(dsound_winetest uuid dxguid) set_module_type(dsound_winetest win32cui) add_importlibs(dsound_winetest ole32 user32 msvcrt kernel32) -add_cd_file(TARGET dsound_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET dsound_winetest) diff --git a/rostests/winetests/dxdiagn/CMakeLists.txt b/rostests/winetests/dxdiagn/CMakeLists.txt index 1fbad947fc5..b448156e85f 100644 --- a/rostests/winetests/dxdiagn/CMakeLists.txt +++ b/rostests/winetests/dxdiagn/CMakeLists.txt @@ -7,4 +7,4 @@ list(APPEND SOURCE add_executable(dxdiagn_winetest ${SOURCE}) set_module_type(dxdiagn_winetest win32cui) add_importlibs(dxdiagn_winetest oleaut32 ole32 msvcrt kernel32) -add_cd_file(TARGET dxdiagn_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET dxdiagn_winetest) diff --git a/rostests/winetests/faultrep/CMakeLists.txt b/rostests/winetests/faultrep/CMakeLists.txt index aa56b3fed3c..2e74fdf9615 100644 --- a/rostests/winetests/faultrep/CMakeLists.txt +++ b/rostests/winetests/faultrep/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(faultrep_winetest faultrep.c testlist.c) set_module_type(faultrep_winetest win32cui) add_importlibs(faultrep_winetest faultrep advapi32 msvcrt kernel32) -add_cd_file(TARGET faultrep_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET faultrep_winetest) diff --git a/rostests/winetests/fusion/CMakeLists.txt b/rostests/winetests/fusion/CMakeLists.txt index e5fd8748eaf..0c908735377 100644 --- a/rostests/winetests/fusion/CMakeLists.txt +++ b/rostests/winetests/fusion/CMakeLists.txt @@ -11,4 +11,4 @@ list(APPEND SOURCE add_executable(fusion_winetest ${SOURCE}) set_module_type(fusion_winetest win32cui) add_importlibs(fusion_winetest user32 msvcrt kernel32) -add_cd_file(TARGET fusion_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET fusion_winetest) diff --git a/rostests/winetests/gdi32/CMakeLists.txt b/rostests/winetests/gdi32/CMakeLists.txt index 6de9f0a20d9..79cdf3125d5 100644 --- a/rostests/winetests/gdi32/CMakeLists.txt +++ b/rostests/winetests/gdi32/CMakeLists.txt @@ -26,4 +26,4 @@ if(MSVC) add_importlibs(gdi32_winetest ntdll) endif() -add_cd_file(TARGET gdi32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET gdi32_winetest) diff --git a/rostests/winetests/gdiplus/CMakeLists.txt b/rostests/winetests/gdiplus/CMakeLists.txt index 4f8c5b1fe01..06ad713502c 100644 --- a/rostests/winetests/gdiplus/CMakeLists.txt +++ b/rostests/winetests/gdiplus/CMakeLists.txt @@ -19,4 +19,4 @@ list(APPEND SOURCE add_executable(gdiplus_winetest ${SOURCE}) set_module_type(gdiplus_winetest win32cui) add_importlibs(gdiplus_winetest gdiplus user32 gdi32 ole32 msvcrt kernel32) -add_cd_file(TARGET gdiplus_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET gdiplus_winetest) diff --git a/rostests/winetests/hlink/CMakeLists.txt b/rostests/winetests/hlink/CMakeLists.txt index 4f6b05f2394..45ac9317730 100644 --- a/rostests/winetests/hlink/CMakeLists.txt +++ b/rostests/winetests/hlink/CMakeLists.txt @@ -9,4 +9,4 @@ list(APPEND SOURCE add_executable(hlink_winetest ${SOURCE}) set_module_type(hlink_winetest win32cui) add_importlibs(hlink_winetest hlink ole32 msvcrt kernel32) -add_cd_file(TARGET hlink_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET hlink_winetest) diff --git a/rostests/winetests/imagehlp/CMakeLists.txt b/rostests/winetests/imagehlp/CMakeLists.txt index b2c70b828fc..fdcdfd80961 100644 --- a/rostests/winetests/imagehlp/CMakeLists.txt +++ b/rostests/winetests/imagehlp/CMakeLists.txt @@ -9,4 +9,4 @@ list(APPEND SOURCE add_executable(imagehlp_winetest ${SOURCE}) set_module_type(imagehlp_winetest win32cui) add_importlibs(imagehlp_winetest msvcrt kernel32) -add_cd_file(TARGET imagehlp_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET imagehlp_winetest) diff --git a/rostests/winetests/imm32/CMakeLists.txt b/rostests/winetests/imm32/CMakeLists.txt index f145b449f6e..972f443ffe2 100644 --- a/rostests/winetests/imm32/CMakeLists.txt +++ b/rostests/winetests/imm32/CMakeLists.txt @@ -3,4 +3,4 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) add_executable(imm32_winetest imm32.c testlist.c) set_module_type(imm32_winetest win32cui) add_importlibs(imm32_winetest imm32 user32 msvcrt kernel32) -add_cd_file(TARGET imm32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET imm32_winetest) diff --git a/rostests/winetests/inetcomm/CMakeLists.txt b/rostests/winetests/inetcomm/CMakeLists.txt index 5354fd74a31..a9c70a80bd8 100644 --- a/rostests/winetests/inetcomm/CMakeLists.txt +++ b/rostests/winetests/inetcomm/CMakeLists.txt @@ -9,4 +9,4 @@ list(APPEND SOURCE add_executable(inetcomm_winetest ${SOURCE}) set_module_type(inetcomm_winetest win32cui) add_importlibs(inetcomm_winetest inetcomm oleaut32 ole32 msvcrt kernel32) -add_cd_file(TARGET inetcomm_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET inetcomm_winetest) diff --git a/rostests/winetests/inetmib1/CMakeLists.txt b/rostests/winetests/inetmib1/CMakeLists.txt index f0414e8a8c9..eb384ee5196 100644 --- a/rostests/winetests/inetmib1/CMakeLists.txt +++ b/rostests/winetests/inetmib1/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(inetmib1_winetest main.c testlist.c) set_module_type(inetmib1_winetest win32cui) add_importlibs(inetmib1_winetest snmpapi msvcrt kernel32) -add_cd_file(TARGET inetmib1_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET inetmib1_winetest) diff --git a/rostests/winetests/iphlpapi/CMakeLists.txt b/rostests/winetests/iphlpapi/CMakeLists.txt index 0309020e8a6..987ffde3854 100644 --- a/rostests/winetests/iphlpapi/CMakeLists.txt +++ b/rostests/winetests/iphlpapi/CMakeLists.txt @@ -3,4 +3,4 @@ add_executable(iphlpapi_winetest iphlpapi.c testlist.c) target_link_libraries(iphlpapi_winetest wine) set_module_type(iphlpapi_winetest win32cui) add_importlibs(iphlpapi_winetest ws2_32 msvcrt kernel32 ntdll) -add_cd_file(TARGET iphlpapi_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET iphlpapi_winetest) diff --git a/rostests/winetests/itss/CMakeLists.txt b/rostests/winetests/itss/CMakeLists.txt index 3fb46188ea9..52e8d75771f 100644 --- a/rostests/winetests/itss/CMakeLists.txt +++ b/rostests/winetests/itss/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(itss_winetest protocol.c testlist.c rsrc.rc) set_module_type(itss_winetest win32cui) add_importlibs(itss_winetest ole32 msvcrt kernel32) -add_cd_file(TARGET itss_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET itss_winetest) diff --git a/rostests/winetests/jscript/CMakeLists.txt b/rostests/winetests/jscript/CMakeLists.txt index a7c198d6130..74357c70e44 100644 --- a/rostests/winetests/jscript/CMakeLists.txt +++ b/rostests/winetests/jscript/CMakeLists.txt @@ -21,4 +21,4 @@ set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${jscript_winetes add_executable(jscript_winetest ${SOURCE} rsrc.rc) set_module_type(jscript_winetest win32cui) add_importlibs(jscript_winetest ole32 oleaut32 advapi32 msvcrt kernel32) -add_cd_file(TARGET jscript_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET jscript_winetest) diff --git a/rostests/winetests/kernel32/CMakeLists.txt b/rostests/winetests/kernel32/CMakeLists.txt index 85d4beb488a..90e4155ab92 100644 --- a/rostests/winetests/kernel32/CMakeLists.txt +++ b/rostests/winetests/kernel32/CMakeLists.txt @@ -46,4 +46,4 @@ endif() set_module_type(kernel32_winetest win32cui) add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll) -add_cd_file(TARGET kernel32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET kernel32_winetest) diff --git a/rostests/winetests/localspl/CMakeLists.txt b/rostests/winetests/localspl/CMakeLists.txt index 268487d56cd..975a6c2ecb7 100644 --- a/rostests/winetests/localspl/CMakeLists.txt +++ b/rostests/winetests/localspl/CMakeLists.txt @@ -3,4 +3,4 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) add_executable(localspl_winetest localmon.c testlist.c) set_module_type(localspl_winetest win32cui) add_importlibs(localspl_winetest advapi32 msvcrt kernel32) -add_cd_file(TARGET localspl_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET localspl_winetest) diff --git a/rostests/winetests/localui/CMakeLists.txt b/rostests/winetests/localui/CMakeLists.txt index 15c2fdc40c1..93a95863c58 100644 --- a/rostests/winetests/localui/CMakeLists.txt +++ b/rostests/winetests/localui/CMakeLists.txt @@ -3,4 +3,4 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) add_executable(localui_winetest localui.c testlist.c) set_module_type(localui_winetest win32cui) add_importlibs(localui_winetest winspool msvcrt kernel32) -add_cd_file(TARGET localui_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET localui_winetest) diff --git a/rostests/winetests/lz32/CMakeLists.txt b/rostests/winetests/lz32/CMakeLists.txt index e1fe0e52769..1ef4fb9d34e 100644 --- a/rostests/winetests/lz32/CMakeLists.txt +++ b/rostests/winetests/lz32/CMakeLists.txt @@ -3,4 +3,4 @@ add_definitions(-DUSE_WINE_TODOS) add_executable(lz32_winetest lzexpand_main.c testlist.c) set_module_type(lz32_winetest win32cui) add_importlibs(lz32_winetest lz32 msvcrt kernel32) -add_cd_file(TARGET lz32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET lz32_winetest) diff --git a/rostests/winetests/mapi32/CMakeLists.txt b/rostests/winetests/mapi32/CMakeLists.txt index a140a04d68e..1b5f5bd30c1 100644 --- a/rostests/winetests/mapi32/CMakeLists.txt +++ b/rostests/winetests/mapi32/CMakeLists.txt @@ -8,4 +8,4 @@ list(APPEND SOURCE add_executable(mapi32_winetest ${SOURCE}) set_module_type(mapi32_winetest win32cui) add_importlibs(mapi32_winetest advapi32 msvcrt kernel32) -add_cd_file(TARGET mapi32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET mapi32_winetest) diff --git a/rostests/winetests/mlang/CMakeLists.txt b/rostests/winetests/mlang/CMakeLists.txt index 2bf53f79c49..49e74141a9e 100644 --- a/rostests/winetests/mlang/CMakeLists.txt +++ b/rostests/winetests/mlang/CMakeLists.txt @@ -3,4 +3,4 @@ add_definitions(-DUSE_WINE_TODOS) add_executable(mlang_winetest mlang.c testlist.c) set_module_type(mlang_winetest win32cui) add_importlibs(mlang_winetest mlang oleaut32 ole32 gdi32 msvcrt kernel32) -add_cd_file(TARGET mlang_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET mlang_winetest) diff --git a/rostests/winetests/mmdevapi/CMakeLists.txt b/rostests/winetests/mmdevapi/CMakeLists.txt index d9596292bfb..569915d16f0 100644 --- a/rostests/winetests/mmdevapi/CMakeLists.txt +++ b/rostests/winetests/mmdevapi/CMakeLists.txt @@ -14,4 +14,4 @@ set_module_type(mmdevapi_winetest win32cui) target_link_libraries(mmdevapi_winetest uuid) add_importlibs(mmdevapi_winetest ole32 user32 advapi32 msvcrt kernel32 ntdll) add_dependencies(mmdevapi_winetest dxsdk) -add_cd_file(TARGET mmdevapi_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET mmdevapi_winetest) diff --git a/rostests/winetests/mpr/CMakeLists.txt b/rostests/winetests/mpr/CMakeLists.txt index b31f026c952..662f1678f61 100644 --- a/rostests/winetests/mpr/CMakeLists.txt +++ b/rostests/winetests/mpr/CMakeLists.txt @@ -6,4 +6,4 @@ add_definitions( add_executable(mpr_winetest mpr.c testlist.c) set_module_type(mpr_winetest win32cui) add_importlibs(mpr_winetest mpr msvcrt kernel32) -add_cd_file(TARGET mpr_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET mpr_winetest) diff --git a/rostests/winetests/msacm32/CMakeLists.txt b/rostests/winetests/msacm32/CMakeLists.txt index 8a873e6ada2..b8135acdaf2 100644 --- a/rostests/winetests/msacm32/CMakeLists.txt +++ b/rostests/winetests/msacm32/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(msacm32_winetest msacm.c testlist.c) set_module_type(msacm32_winetest win32cui) add_importlibs(msacm32_winetest msacm32 msvcrt kernel32) -add_cd_file(TARGET msacm32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET msacm32_winetest) diff --git a/rostests/winetests/mscms/CMakeLists.txt b/rostests/winetests/mscms/CMakeLists.txt index 88d5d7da656..f3ca0d33574 100644 --- a/rostests/winetests/mscms/CMakeLists.txt +++ b/rostests/winetests/mscms/CMakeLists.txt @@ -3,4 +3,4 @@ add_definitions(-DUSE_WINE_TODOS) add_executable(mscms_winetest profile.c testlist.c) set_module_type(mscms_winetest win32cui) add_importlibs(mscms_winetest msvcrt kernel32) -add_cd_file(TARGET mscms_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET mscms_winetest) diff --git a/rostests/winetests/mscoree/CMakeLists.txt b/rostests/winetests/mscoree/CMakeLists.txt index 7ceaaae327c..0e3cd68b2f7 100644 --- a/rostests/winetests/mscoree/CMakeLists.txt +++ b/rostests/winetests/mscoree/CMakeLists.txt @@ -10,4 +10,4 @@ add_executable(mscoree_winetest target_link_libraries(mscoree_winetest wine uuid) set_module_type(mscoree_winetest win32cui) add_importlibs(mscoree_winetest ole32 shlwapi msvcrt kernel32 ntdll) -add_cd_file(TARGET mscoree_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET mscoree_winetest) diff --git a/rostests/winetests/msctf/CMakeLists.txt b/rostests/winetests/msctf/CMakeLists.txt index 14ee96cd43e..78537364226 100644 --- a/rostests/winetests/msctf/CMakeLists.txt +++ b/rostests/winetests/msctf/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(msctf_winetest inputprocessor.c testlist.c) set_module_type(msctf_winetest win32cui) add_importlibs(msctf_winetest ole32 user32 msvcrt kernel32) -add_cd_file(TARGET msctf_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET msctf_winetest) diff --git a/rostests/winetests/mshtml/CMakeLists.txt b/rostests/winetests/mshtml/CMakeLists.txt index e0e34acd931..5384512e52b 100644 --- a/rostests/winetests/mshtml/CMakeLists.txt +++ b/rostests/winetests/mshtml/CMakeLists.txt @@ -33,4 +33,4 @@ target_link_libraries(mshtml_winetest uuid strmiids) set_module_type(mshtml_winetest win32cui) add_importlibs(mshtml_winetest wininet ole32 oleaut32 user32 gdi32 urlmon advapi32 msvcrt kernel32) add_dependencies(mshtml_winetest test_tlb_header stdole2) -add_cd_file(TARGET mshtml_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET mshtml_winetest) diff --git a/rostests/winetests/msi/CMakeLists.txt b/rostests/winetests/msi/CMakeLists.txt index c3f0d0f0e8d..01498466d0a 100644 --- a/rostests/winetests/msi/CMakeLists.txt +++ b/rostests/winetests/msi/CMakeLists.txt @@ -21,4 +21,4 @@ add_executable(msi_winetest ${SOURCE}) target_link_libraries(msi_winetest uuid) set_module_type(msi_winetest win32cui) add_importlibs(msi_winetest cabinet msi shell32 ole32 oleaut32 user32 advapi32 version msvcrt kernel32) -add_cd_file(TARGET msi_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET msi_winetest) diff --git a/rostests/winetests/msrle32/CMakeLists.txt b/rostests/winetests/msrle32/CMakeLists.txt index a3a8c2c62fb..b518e561637 100644 --- a/rostests/winetests/msrle32/CMakeLists.txt +++ b/rostests/winetests/msrle32/CMakeLists.txt @@ -3,4 +3,4 @@ add_definitions(-DUSE_WINE_TODOS) add_executable(msrle32_winetest msrle.c testlist.c) set_module_type(msrle32_winetest win32cui) add_importlibs(msrle32_winetest msvfw32 msvcrt kernel32) -add_cd_file(TARGET msrle32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET msrle32_winetest) diff --git a/rostests/winetests/mstask/CMakeLists.txt b/rostests/winetests/mstask/CMakeLists.txt index 13b0a4a5c7b..936247fc63f 100644 --- a/rostests/winetests/mstask/CMakeLists.txt +++ b/rostests/winetests/mstask/CMakeLists.txt @@ -8,4 +8,4 @@ list(APPEND SOURCE add_executable(mstask_winetest ${SOURCE}) set_module_type(mstask_winetest win32cui) add_importlibs(mstask_winetest ole32 user32 msvcrt kernel32) -add_cd_file(TARGET mstask_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET mstask_winetest) diff --git a/rostests/winetests/msvcrt/CMakeLists.txt b/rostests/winetests/msvcrt/CMakeLists.txt index 2fae9591d01..062870d9373 100644 --- a/rostests/winetests/msvcrt/CMakeLists.txt +++ b/rostests/winetests/msvcrt/CMakeLists.txt @@ -31,4 +31,4 @@ else() add_target_compile_flags(msvcrt_winetest "-Wno-format") endif() -add_cd_file(TARGET msvcrt_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET msvcrt_winetest) diff --git a/rostests/winetests/msvcrtd/CMakeLists.txt b/rostests/winetests/msvcrtd/CMakeLists.txt index 714cdcfc8ca..75091187339 100644 --- a/rostests/winetests/msvcrtd/CMakeLists.txt +++ b/rostests/winetests/msvcrtd/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(msvcrtd_winetest debug.c testlist.c) set_module_type(msvcrtd_winetest win32cui) add_importlibs(msvcrtd_winetest msvcrt kernel32) -add_cd_file(TARGET msvcrtd_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET msvcrtd_winetest) diff --git a/rostests/winetests/msvfw32/CMakeLists.txt b/rostests/winetests/msvfw32/CMakeLists.txt index d86ffc88399..f8c3038ec60 100644 --- a/rostests/winetests/msvfw32/CMakeLists.txt +++ b/rostests/winetests/msvfw32/CMakeLists.txt @@ -3,4 +3,4 @@ add_definitions(-DUSE_WINE_TODOS) add_executable(msvfw32_winetest drawdib.c msvfw.c testlist.c) set_module_type(msvfw32_winetest win32cui) add_importlibs(msvfw32_winetest gdi32 advapi32 msvfw32 msvcrt kernel32) -add_cd_file(TARGET msvfw32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET msvfw32_winetest) diff --git a/rostests/winetests/msxml3/CMakeLists.txt b/rostests/winetests/msxml3/CMakeLists.txt index ee35c8d3ad3..20b23b96665 100644 --- a/rostests/winetests/msxml3/CMakeLists.txt +++ b/rostests/winetests/msxml3/CMakeLists.txt @@ -21,4 +21,4 @@ if(MSVC) add_importlibs(msxml3_winetest ntdll) endif() -add_cd_file(TARGET msxml3_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET msxml3_winetest) diff --git a/rostests/winetests/netapi32/CMakeLists.txt b/rostests/winetests/netapi32/CMakeLists.txt index a360223bb27..c7831b267c3 100644 --- a/rostests/winetests/netapi32/CMakeLists.txt +++ b/rostests/winetests/netapi32/CMakeLists.txt @@ -9,4 +9,4 @@ list(APPEND SOURCE add_executable(netapi32_winetest ${SOURCE}) set_module_type(netapi32_winetest win32cui) add_importlibs(netapi32_winetest advapi32 msvcrt kernel32) -add_cd_file(TARGET netapi32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET netapi32_winetest) diff --git a/rostests/winetests/netcfgx/CMakeLists.txt b/rostests/winetests/netcfgx/CMakeLists.txt index 3fdb02fddc1..41a4396b895 100644 --- a/rostests/winetests/netcfgx/CMakeLists.txt +++ b/rostests/winetests/netcfgx/CMakeLists.txt @@ -3,4 +3,4 @@ add_executable(netcfgx_winetest netcfgx.c testlist.c) target_link_libraries(netcfgx_winetest uuid) set_module_type(netcfgx_winetest win32cui) add_importlibs(netcfgx_winetest ole32 msvcrt kernel32) -add_cd_file(TARGET netcfgx_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET netcfgx_winetest) diff --git a/rostests/winetests/ntdll/CMakeLists.txt b/rostests/winetests/ntdll/CMakeLists.txt index e1b3b998bfa..46768541ac8 100644 --- a/rostests/winetests/ntdll/CMakeLists.txt +++ b/rostests/winetests/ntdll/CMakeLists.txt @@ -29,7 +29,7 @@ list(APPEND SOURCE add_executable(ntdll_winetest ${SOURCE}) set_module_type(ntdll_winetest win32cui) add_importlibs(ntdll_winetest user32 ole32 advapi32 msvcrt kernel32 ntdll) -add_cd_file(TARGET ntdll_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET ntdll_winetest) if(NOT MSVC) add_target_compile_flags(ntdll_winetest "-Wno-format") diff --git a/rostests/winetests/ntdsapi/CMakeLists.txt b/rostests/winetests/ntdsapi/CMakeLists.txt index 9b3c1a6b51d..bacaa6b908b 100644 --- a/rostests/winetests/ntdsapi/CMakeLists.txt +++ b/rostests/winetests/ntdsapi/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(ntdsapi_winetest ntdsapi.c testlist.c) set_module_type(ntdsapi_winetest win32cui) add_importlibs(ntdsapi_winetest ntdsapi msvcrt kernel32) -add_cd_file(TARGET ntdsapi_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET ntdsapi_winetest) diff --git a/rostests/winetests/ntprint/CMakeLists.txt b/rostests/winetests/ntprint/CMakeLists.txt index ffa8c9158e6..3b6942d3a93 100644 --- a/rostests/winetests/ntprint/CMakeLists.txt +++ b/rostests/winetests/ntprint/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(ntprint_winetest ntprint.c testlist.c) set_module_type(ntprint_winetest win32cui) add_importlibs(ntprint_winetest msvcrt kernel32) -add_cd_file(TARGET ntprint_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET ntprint_winetest) diff --git a/rostests/winetests/odbccp32/CMakeLists.txt b/rostests/winetests/odbccp32/CMakeLists.txt index d051898e180..88b9e818244 100644 --- a/rostests/winetests/odbccp32/CMakeLists.txt +++ b/rostests/winetests/odbccp32/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(odbccp32_winetest misc.c testlist.c) set_module_type(odbccp32_winetest win32cui) add_importlibs(odbccp32_winetest odbccp32 advapi32 msvcrt kernel32) -add_cd_file(TARGET odbccp32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET odbccp32_winetest) diff --git a/rostests/winetests/ole32/CMakeLists.txt b/rostests/winetests/ole32/CMakeLists.txt index 5ecea1b3405..78fe6dff668 100644 --- a/rostests/winetests/ole32/CMakeLists.txt +++ b/rostests/winetests/ole32/CMakeLists.txt @@ -27,4 +27,4 @@ if(MSVC) add_importlibs(ole32_winetest ntdll) endif() -add_cd_file(TARGET ole32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET ole32_winetest) diff --git a/rostests/winetests/oleacc/CMakeLists.txt b/rostests/winetests/oleacc/CMakeLists.txt index 4194ad50f85..31181220aca 100644 --- a/rostests/winetests/oleacc/CMakeLists.txt +++ b/rostests/winetests/oleacc/CMakeLists.txt @@ -3,4 +3,4 @@ add_executable(oleacc_winetest main.c testlist.c) set_module_type(oleacc_winetest win32cui) target_link_libraries(oleacc_winetest uuid) add_importlibs(oleacc_winetest oleacc oleaut32 ole32 user32 msvcrt kernel32) -add_cd_file(TARGET oleacc_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET oleacc_winetest) diff --git a/rostests/winetests/oleaut32/CMakeLists.txt b/rostests/winetests/oleaut32/CMakeLists.txt index 20813eb2df1..e1d61fee9bb 100644 --- a/rostests/winetests/oleaut32/CMakeLists.txt +++ b/rostests/winetests/oleaut32/CMakeLists.txt @@ -37,4 +37,4 @@ if(MSVC) endif() add_dependencies(oleaut32_winetest stdole2 oleaut32_idlheaders) -add_cd_file(TARGET oleaut32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET oleaut32_winetest) diff --git a/rostests/winetests/oledlg/CMakeLists.txt b/rostests/winetests/oledlg/CMakeLists.txt index c12f7e403c1..83e2ad777ee 100644 --- a/rostests/winetests/oledlg/CMakeLists.txt +++ b/rostests/winetests/oledlg/CMakeLists.txt @@ -4,4 +4,4 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) add_executable(oledlg_winetest main.c testlist.c) set_module_type(oledlg_winetest win32cui) add_importlibs(oledlg_winetest oledlg ole32 user32 msvcrt kernel32) -add_cd_file(TARGET oledlg_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET oledlg_winetest) diff --git a/rostests/winetests/opengl32/CMakeLists.txt b/rostests/winetests/opengl32/CMakeLists.txt index 955f072bb28..8ec9b966bc7 100644 --- a/rostests/winetests/opengl32/CMakeLists.txt +++ b/rostests/winetests/opengl32/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(opengl32_winetest opengl.c testlist.c) set_module_type(opengl32_winetest win32cui) add_importlibs(opengl32_winetest opengl32 gdi32 user32 msvcrt kernel32) -add_cd_file(TARGET opengl32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET opengl32_winetest) diff --git a/rostests/winetests/pdh/CMakeLists.txt b/rostests/winetests/pdh/CMakeLists.txt index ea53eb2ee94..5fe1bbd003b 100644 --- a/rostests/winetests/pdh/CMakeLists.txt +++ b/rostests/winetests/pdh/CMakeLists.txt @@ -7,4 +7,4 @@ if(MSVC) add_importlibs(pdh_winetest ntdll) endif() -add_cd_file(TARGET pdh_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET pdh_winetest) diff --git a/rostests/winetests/propsys/CMakeLists.txt b/rostests/winetests/propsys/CMakeLists.txt index f0c740f2396..787af9a382c 100644 --- a/rostests/winetests/propsys/CMakeLists.txt +++ b/rostests/winetests/propsys/CMakeLists.txt @@ -8,4 +8,4 @@ if(MSVC) add_importlibs(propsys_winetest ntdll) endif() -add_cd_file(TARGET propsys_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET propsys_winetest) diff --git a/rostests/winetests/psapi/CMakeLists.txt b/rostests/winetests/psapi/CMakeLists.txt index 0a4976afa5c..638c93f7e73 100644 --- a/rostests/winetests/psapi/CMakeLists.txt +++ b/rostests/winetests/psapi/CMakeLists.txt @@ -3,4 +3,4 @@ add_definitions(-D__WINESRC__) add_executable(psapi_winetest psapi_main.c testlist.c) set_module_type(psapi_winetest win32cui) add_importlibs(psapi_winetest msvcrt kernel32) -add_cd_file(TARGET psapi_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET psapi_winetest) diff --git a/rostests/winetests/qedit/CMakeLists.txt b/rostests/winetests/qedit/CMakeLists.txt index d7d7e55e679..8128d9a3f5e 100644 --- a/rostests/winetests/qedit/CMakeLists.txt +++ b/rostests/winetests/qedit/CMakeLists.txt @@ -3,4 +3,4 @@ add_definitions(-DUSE_WINE_TODOS) add_executable(qedit_winetest mediadet.c testlist.c qedit.rc) set_module_type(qedit_winetest win32cui) add_importlibs(qedit_winetest oleaut32 ole32 msvcrt kernel32) -add_cd_file(TARGET qedit_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET qedit_winetest) diff --git a/rostests/winetests/qmgr/CMakeLists.txt b/rostests/winetests/qmgr/CMakeLists.txt index 739f05e2cb3..f2d2aa7ef49 100644 --- a/rostests/winetests/qmgr/CMakeLists.txt +++ b/rostests/winetests/qmgr/CMakeLists.txt @@ -15,4 +15,4 @@ if(MSVC) add_importlibs(qmgr_winetest ntdll) endif() -add_cd_file(TARGET qmgr_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET qmgr_winetest) diff --git a/rostests/winetests/quartz/CMakeLists.txt b/rostests/winetests/quartz/CMakeLists.txt index d038f326a01..440efaf24c0 100644 --- a/rostests/winetests/quartz/CMakeLists.txt +++ b/rostests/winetests/quartz/CMakeLists.txt @@ -24,4 +24,4 @@ if(MSVC) add_importlibs(quartz_winetest ntdll) endif() -add_cd_file(TARGET quartz_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET quartz_winetest) diff --git a/rostests/winetests/rasapi32/CMakeLists.txt b/rostests/winetests/rasapi32/CMakeLists.txt index bc86eefb57e..32737db1722 100644 --- a/rostests/winetests/rasapi32/CMakeLists.txt +++ b/rostests/winetests/rasapi32/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(rasapi32_winetest rasapi.c testlist.c) set_module_type(rasapi32_winetest win32cui) add_importlibs(rasapi32_winetest msvcrt kernel32) -add_cd_file(TARGET rasapi32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET rasapi32_winetest) diff --git a/rostests/winetests/reg/CMakeLists.txt b/rostests/winetests/reg/CMakeLists.txt index 28b3f7b597c..debaaa4f2dd 100644 --- a/rostests/winetests/reg/CMakeLists.txt +++ b/rostests/winetests/reg/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(reg_winetest reg.c testlist.c) set_module_type(reg_winetest win32cui) add_importlibs(reg_winetest advapi32 msvcrt kernel32) -add_cd_file(TARGET reg_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET reg_winetest) diff --git a/rostests/winetests/regedit/CMakeLists.txt b/rostests/winetests/regedit/CMakeLists.txt index 45bb7e359bc..280fb4e21d4 100644 --- a/rostests/winetests/regedit/CMakeLists.txt +++ b/rostests/winetests/regedit/CMakeLists.txt @@ -3,4 +3,4 @@ add_executable(regedit_winetest regedit.c testlist.c) target_link_libraries(regedit_winetest wine) set_module_type(regedit_winetest win32cui) add_importlibs(regedit_winetest advapi32 msvcrt kernel32 ntdll) -add_cd_file(TARGET regedit_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET regedit_winetest) diff --git a/rostests/winetests/riched20/CMakeLists.txt b/rostests/winetests/riched20/CMakeLists.txt index 305b2b23a78..fe220a495ba 100644 --- a/rostests/winetests/riched20/CMakeLists.txt +++ b/rostests/winetests/riched20/CMakeLists.txt @@ -14,4 +14,4 @@ endif() add_executable(riched20_winetest ${SOURCE}) set_module_type(riched20_winetest win32cui) add_importlibs(riched20_winetest ole32 oleaut32 user32 gdi32 msvcrt kernel32) -add_cd_file(TARGET riched20_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET riched20_winetest) diff --git a/rostests/winetests/riched32/CMakeLists.txt b/rostests/winetests/riched32/CMakeLists.txt index edf34805492..64ce84db002 100644 --- a/rostests/winetests/riched32/CMakeLists.txt +++ b/rostests/winetests/riched32/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(riched32_winetest editor.c testlist.c) set_module_type(riched32_winetest win32cui) add_importlibs(riched32_winetest ole32 user32 msvcrt kernel32) -add_cd_file(TARGET riched32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET riched32_winetest) diff --git a/rostests/winetests/rpcrt4/CMakeLists.txt b/rostests/winetests/rpcrt4/CMakeLists.txt index f07d2050f31..94d447ec0cb 100644 --- a/rostests/winetests/rpcrt4/CMakeLists.txt +++ b/rostests/winetests/rpcrt4/CMakeLists.txt @@ -29,7 +29,7 @@ add_executable(rpcrt4_winetest ${SOURCE}) target_link_libraries(rpcrt4_winetest uuid wine ${PSEH_LIB}) set_module_type(rpcrt4_winetest win32cui) add_importlibs(rpcrt4_winetest ole32 rpcrt4 secur32 msvcrt kernel32 ntdll) -add_cd_file(TARGET rpcrt4_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET rpcrt4_winetest) if(NOT MSVC) add_target_compile_flags(rpcrt4_winetest "-Wno-format") diff --git a/rostests/winetests/rsaenh/CMakeLists.txt b/rostests/winetests/rsaenh/CMakeLists.txt index b084a68a9ae..bb5b0493dd7 100644 --- a/rostests/winetests/rsaenh/CMakeLists.txt +++ b/rostests/winetests/rsaenh/CMakeLists.txt @@ -3,4 +3,4 @@ add_definitions(-DUSE_WINE_TODOS) add_executable(rsaenh_winetest rsaenh.c testlist.c) set_module_type(rsaenh_winetest win32cui) add_importlibs(rsaenh_winetest advapi32 msvcrt kernel32) -add_cd_file(TARGET rsaenh_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET rsaenh_winetest) diff --git a/rostests/winetests/schannel/CMakeLists.txt b/rostests/winetests/schannel/CMakeLists.txt index cccd12cb399..d6844ba88b2 100644 --- a/rostests/winetests/schannel/CMakeLists.txt +++ b/rostests/winetests/schannel/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(schannel_winetest main.c testlist.c) set_module_type(schannel_winetest win32cui) add_importlibs(schannel_winetest msvcrt kernel32) -add_cd_file(TARGET schannel_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET schannel_winetest) diff --git a/rostests/winetests/scrrun/CMakeLists.txt b/rostests/winetests/scrrun/CMakeLists.txt index 23ce6e2ec2c..ae999090b92 100644 --- a/rostests/winetests/scrrun/CMakeLists.txt +++ b/rostests/winetests/scrrun/CMakeLists.txt @@ -12,4 +12,4 @@ add_dependencies(scrrun_winetest scrrun_idlheader_test) target_link_libraries(scrrun_winetest uuid) set_module_type(scrrun_winetest win32cui) add_importlibs(scrrun_winetest ole32 oleaut32 user32 msvcrt kernel32) -add_cd_file(TARGET scrrun_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET scrrun_winetest) diff --git a/rostests/winetests/secur32/CMakeLists.txt b/rostests/winetests/secur32/CMakeLists.txt index f1727c87a7c..99d1a76037a 100644 --- a/rostests/winetests/secur32/CMakeLists.txt +++ b/rostests/winetests/secur32/CMakeLists.txt @@ -10,4 +10,4 @@ list(APPEND SOURCE add_executable(secur32_winetest ${SOURCE}) set_module_type(secur32_winetest win32cui) add_importlibs(secur32_winetest advapi32 ws2_32 crypt32 secur32 msvcrt kernel32) -add_cd_file(TARGET secur32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET secur32_winetest) diff --git a/rostests/winetests/serialui/CMakeLists.txt b/rostests/winetests/serialui/CMakeLists.txt index d696f5a5c60..02a331d5faa 100644 --- a/rostests/winetests/serialui/CMakeLists.txt +++ b/rostests/winetests/serialui/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(serialui_winetest confdlg.c testlist.c) set_module_type(serialui_winetest win32cui) add_importlibs(serialui_winetest msvcrt kernel32) -add_cd_file(TARGET serialui_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET serialui_winetest) diff --git a/rostests/winetests/services/CMakeLists.txt b/rostests/winetests/services/CMakeLists.txt index 065eca36a1a..76ec1afef89 100644 --- a/rostests/winetests/services/CMakeLists.txt +++ b/rostests/winetests/services/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(services_winetest service.c testlist.c) set_module_type(services_winetest win32cui) add_importlibs(services_winetest advapi32 msvcrt kernel32) -add_cd_file(TARGET services_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET services_winetest) diff --git a/rostests/winetests/setupapi/CMakeLists.txt b/rostests/winetests/setupapi/CMakeLists.txt index 638322b6876..0dafc11c195 100644 --- a/rostests/winetests/setupapi/CMakeLists.txt +++ b/rostests/winetests/setupapi/CMakeLists.txt @@ -14,4 +14,4 @@ list(APPEND SOURCE add_executable(setupapi_winetest ${SOURCE} setupapi.rc) set_module_type(setupapi_winetest win32cui) add_importlibs(setupapi_winetest advapi32 setupapi user32 msvcrt kernel32 ntdll) -add_cd_file(TARGET setupapi_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET setupapi_winetest) diff --git a/rostests/winetests/shdocvw/CMakeLists.txt b/rostests/winetests/shdocvw/CMakeLists.txt index 8b758646832..d3251d19855 100644 --- a/rostests/winetests/shdocvw/CMakeLists.txt +++ b/rostests/winetests/shdocvw/CMakeLists.txt @@ -10,4 +10,4 @@ add_executable(shdocvw_winetest ${SOURCE}) target_link_libraries(shdocvw_winetest uuid) set_module_type(shdocvw_winetest win32cui) add_importlibs(shdocvw_winetest shell32 ole32 advapi32 msvcrt kernel32) -add_cd_file(TARGET shdocvw_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET shdocvw_winetest) diff --git a/rostests/winetests/shell32/CMakeLists.txt b/rostests/winetests/shell32/CMakeLists.txt index 525bd5f2915..1f3bfdc8ef3 100644 --- a/rostests/winetests/shell32/CMakeLists.txt +++ b/rostests/winetests/shell32/CMakeLists.txt @@ -33,4 +33,4 @@ if(MSVC) add_importlibs(shell32_winetest ntdll) endif() -add_cd_file(TARGET shell32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET shell32_winetest) diff --git a/rostests/winetests/shlwapi/CMakeLists.txt b/rostests/winetests/shlwapi/CMakeLists.txt index 400cba13bcf..4d32cb308c5 100644 --- a/rostests/winetests/shlwapi/CMakeLists.txt +++ b/rostests/winetests/shlwapi/CMakeLists.txt @@ -24,4 +24,4 @@ if(MSVC) add_importlibs(shlwapi_winetest ntdll) endif() -add_cd_file(TARGET shlwapi_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET shlwapi_winetest) diff --git a/rostests/winetests/snmpapi/CMakeLists.txt b/rostests/winetests/snmpapi/CMakeLists.txt index 25ee9333bc1..9a7caf2d65e 100644 --- a/rostests/winetests/snmpapi/CMakeLists.txt +++ b/rostests/winetests/snmpapi/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(snmpapi_winetest util.c testlist.c) set_module_type(snmpapi_winetest win32cui) add_importlibs(snmpapi_winetest snmpapi msvcrt kernel32) -add_cd_file(TARGET snmpapi_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET snmpapi_winetest) diff --git a/rostests/winetests/spoolss/CMakeLists.txt b/rostests/winetests/spoolss/CMakeLists.txt index fda59f55efa..8ad84286874 100644 --- a/rostests/winetests/spoolss/CMakeLists.txt +++ b/rostests/winetests/spoolss/CMakeLists.txt @@ -3,4 +3,4 @@ add_definitions(-DUSE_WINE_TODOS) add_executable(spoolss_winetest spoolss.c testlist.c) set_module_type(spoolss_winetest win32cui) add_importlibs(spoolss_winetest msvcrt kernel32) -add_cd_file(TARGET spoolss_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET spoolss_winetest) diff --git a/rostests/winetests/sti/CMakeLists.txt b/rostests/winetests/sti/CMakeLists.txt index 0a4e13d209c..1ddfc3deff5 100644 --- a/rostests/winetests/sti/CMakeLists.txt +++ b/rostests/winetests/sti/CMakeLists.txt @@ -3,4 +3,4 @@ add_definitions(-DUSE_WINE_TODOS) add_executable(sti_winetest sti.c testlist.c) set_module_type(sti_winetest win32cui) add_importlibs(sti_winetest ole32 msvcrt kernel32) -add_cd_file(TARGET sti_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET sti_winetest) diff --git a/rostests/winetests/sxs/CMakeLists.txt b/rostests/winetests/sxs/CMakeLists.txt index 39934b9df14..53b538a2531 100644 --- a/rostests/winetests/sxs/CMakeLists.txt +++ b/rostests/winetests/sxs/CMakeLists.txt @@ -3,4 +3,4 @@ add_definitions(-DUSE_WINE_TODOS) add_executable(sxs_winetest cache.c name.c testlist.c) set_module_type(sxs_winetest win32cui) add_importlibs(sxs_winetest sxs msvcrt kernel32) -add_cd_file(TARGET sxs_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET sxs_winetest) diff --git a/rostests/winetests/twain_32/CMakeLists.txt b/rostests/winetests/twain_32/CMakeLists.txt index 1972c467ed8..4c1e4adda96 100644 --- a/rostests/winetests/twain_32/CMakeLists.txt +++ b/rostests/winetests/twain_32/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(twain_32_winetest dsm.c testlist.c) set_module_type(twain_32_winetest win32cui) add_importlibs(twain_32_winetest user32 gdi32 msvcrt kernel32) -add_cd_file(TARGET twain_32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET twain_32_winetest) diff --git a/rostests/winetests/urlmon/CMakeLists.txt b/rostests/winetests/urlmon/CMakeLists.txt index f2a1106b334..a7595f51c4d 100644 --- a/rostests/winetests/urlmon/CMakeLists.txt +++ b/rostests/winetests/urlmon/CMakeLists.txt @@ -15,4 +15,4 @@ add_executable(urlmon_winetest ${SOURCE}) target_link_libraries(urlmon_winetest uuid) set_module_type(urlmon_winetest win32cui) add_importlibs(urlmon_winetest urlmon wininet ole32 oleaut32 user32 advapi32 msvcrt kernel32) -add_cd_file(TARGET urlmon_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET urlmon_winetest) diff --git a/rostests/winetests/user32/CMakeLists.txt b/rostests/winetests/user32/CMakeLists.txt index d10f4cb3bcf..041e696023f 100644 --- a/rostests/winetests/user32/CMakeLists.txt +++ b/rostests/winetests/user32/CMakeLists.txt @@ -30,4 +30,4 @@ add_executable(user32_winetest ${SOURCE} resource.rc) # some tests need to be run from an app compiled as GUI set_module_type(user32_winetest win32gui) add_importlibs(user32_winetest user32 gdi32 advapi32 msvcrt kernel32) -add_cd_file(TARGET user32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET user32_winetest) diff --git a/rostests/winetests/userenv/CMakeLists.txt b/rostests/winetests/userenv/CMakeLists.txt index 6c83d543ba6..748f0d40967 100644 --- a/rostests/winetests/userenv/CMakeLists.txt +++ b/rostests/winetests/userenv/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(userenv_winetest userenv.c testlist.c) set_module_type(userenv_winetest win32cui) add_importlibs(userenv_winetest userenv advapi32 msvcrt kernel32) -add_cd_file(TARGET userenv_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET userenv_winetest) diff --git a/rostests/winetests/usp10/CMakeLists.txt b/rostests/winetests/usp10/CMakeLists.txt index 4a14a738702..19b5614cda5 100644 --- a/rostests/winetests/usp10/CMakeLists.txt +++ b/rostests/winetests/usp10/CMakeLists.txt @@ -3,4 +3,4 @@ add_definitions(-DUSE_WINE_TODOS) add_executable(usp10_winetest usp10.c testlist.c) set_module_type(usp10_winetest win32cui) add_importlibs(usp10_winetest usp10 user32 gdi32 msvcrt kernel32) -add_cd_file(TARGET usp10_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET usp10_winetest) diff --git a/rostests/winetests/uxtheme/CMakeLists.txt b/rostests/winetests/uxtheme/CMakeLists.txt index 0d576e7da89..83fcc20d6a2 100644 --- a/rostests/winetests/uxtheme/CMakeLists.txt +++ b/rostests/winetests/uxtheme/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(uxtheme_winetest system.c testlist.c) set_module_type(uxtheme_winetest win32cui) add_importlibs(uxtheme_winetest uxtheme user32 msvcrt kernel32) -add_cd_file(TARGET uxtheme_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET uxtheme_winetest) diff --git a/rostests/winetests/vbscript/CMakeLists.txt b/rostests/winetests/vbscript/CMakeLists.txt index 8db064b698a..9491ceede4f 100644 --- a/rostests/winetests/vbscript/CMakeLists.txt +++ b/rostests/winetests/vbscript/CMakeLists.txt @@ -19,4 +19,4 @@ add_executable(vbscript_winetest ${SOURCE} rsrc.rc) set_module_type(vbscript_winetest win32cui) add_importlibs(vbscript_winetest ole32 oleaut32 advapi32 msvcrt kernel32) add_dependencies(vbscript_winetest vbscript_wine_test_idlheader) -add_cd_file(TARGET vbscript_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET vbscript_winetest) diff --git a/rostests/winetests/version/CMakeLists.txt b/rostests/winetests/version/CMakeLists.txt index f02c02268dd..99a2fb5ebf6 100644 --- a/rostests/winetests/version/CMakeLists.txt +++ b/rostests/winetests/version/CMakeLists.txt @@ -14,4 +14,4 @@ if(MSVC) add_importlibs(version_winetest ntdll) endif() -add_cd_file(TARGET version_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET version_winetest) diff --git a/rostests/winetests/wbemdisp/CMakeLists.txt b/rostests/winetests/wbemdisp/CMakeLists.txt index 45453c63659..bc555a44bba 100644 --- a/rostests/winetests/wbemdisp/CMakeLists.txt +++ b/rostests/winetests/wbemdisp/CMakeLists.txt @@ -4,4 +4,4 @@ add_executable(wbemdisp_winetest wbemdisp.c testlist.c) target_link_libraries(wbemdisp_winetest uuid) set_module_type(wbemdisp_winetest win32cui) add_importlibs(wbemdisp_winetest oleaut32 ole32 user32 msvcrt kernel32) -add_cd_file(TARGET wbemdisp_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET wbemdisp_winetest) diff --git a/rostests/winetests/wbemprox/CMakeLists.txt b/rostests/winetests/wbemprox/CMakeLists.txt index c5fb943e058..eb41f2a488a 100644 --- a/rostests/winetests/wbemprox/CMakeLists.txt +++ b/rostests/winetests/wbemprox/CMakeLists.txt @@ -10,4 +10,4 @@ add_executable(wbemprox_winetest ${SOURCE}) target_link_libraries(wbemprox_winetest uuid) set_module_type(wbemprox_winetest win32cui) add_importlibs(wbemprox_winetest advapi32 oleaut32 ole32 user32 msvcrt kernel32) -add_cd_file(TARGET wbemprox_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET wbemprox_winetest) diff --git a/rostests/winetests/windowscodecs/CMakeLists.txt b/rostests/winetests/windowscodecs/CMakeLists.txt index d297d897d33..67bd5b5a7ae 100644 --- a/rostests/winetests/windowscodecs/CMakeLists.txt +++ b/rostests/winetests/windowscodecs/CMakeLists.txt @@ -24,4 +24,4 @@ if(MSVC) add_importlibs(windowscodecs_winetest ntdll) endif() -add_cd_file(TARGET windowscodecs_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET windowscodecs_winetest) diff --git a/rostests/winetests/windowscodecsext/CMakeLists.txt b/rostests/winetests/windowscodecsext/CMakeLists.txt index 5b7de9fbd2b..80af9711a45 100644 --- a/rostests/winetests/windowscodecsext/CMakeLists.txt +++ b/rostests/winetests/windowscodecsext/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(windowscodecsext_winetest transform.c testlist.c) set_module_type(windowscodecsext_winetest win32cui) add_importlibs(windowscodecsext_winetest ole32 windowscodecsext msvcrt kernel32) -add_cd_file(TARGET windowscodecsext_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET windowscodecsext_winetest) diff --git a/rostests/winetests/winhttp/CMakeLists.txt b/rostests/winetests/winhttp/CMakeLists.txt index b7da00f976a..66725934496 100644 --- a/rostests/winetests/winhttp/CMakeLists.txt +++ b/rostests/winetests/winhttp/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(winhttp_winetest ${SOURCE}) target_link_libraries(winhttp_winetest uuid) set_module_type(winhttp_winetest win32cui) add_importlibs(winhttp_winetest winhttp oleaut32 ole32 crypt32 advapi32 ws2_32 msvcrt kernel32) -add_cd_file(TARGET winhttp_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET winhttp_winetest) diff --git a/rostests/winetests/wininet/CMakeLists.txt b/rostests/winetests/wininet/CMakeLists.txt index cb81ec8892d..576bcaaa0ae 100644 --- a/rostests/winetests/wininet/CMakeLists.txt +++ b/rostests/winetests/wininet/CMakeLists.txt @@ -13,4 +13,4 @@ list(APPEND SOURCE add_executable(wininet_winetest ${SOURCE}) set_module_type(wininet_winetest win32cui) add_importlibs(wininet_winetest wininet crypt32 ws2_32 user32 advapi32 msvcrt kernel32) -add_cd_file(TARGET wininet_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET wininet_winetest) diff --git a/rostests/winetests/winmm/CMakeLists.txt b/rostests/winetests/winmm/CMakeLists.txt index ddaeff7b05f..62c1d7f5d63 100644 --- a/rostests/winetests/winmm/CMakeLists.txt +++ b/rostests/winetests/winmm/CMakeLists.txt @@ -15,7 +15,7 @@ add_executable(winmm_winetest ${SOURCE}) target_link_libraries(winmm_winetest dxguid) set_module_type(winmm_winetest win32cui) add_importlibs(winmm_winetest winmm user32 advapi32 msvcrt kernel32) -add_cd_file(TARGET winmm_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET winmm_winetest) if(NOT MSVC) add_target_compile_flags(winmm_winetest "-Wno-format") diff --git a/rostests/winetests/winspool/CMakeLists.txt b/rostests/winetests/winspool/CMakeLists.txt index 0232bf44a2d..fef6dfaa6ce 100644 --- a/rostests/winetests/winspool/CMakeLists.txt +++ b/rostests/winetests/winspool/CMakeLists.txt @@ -5,4 +5,4 @@ add_definitions(-D_WIN32_WINNT=0x600) add_executable(winspool_winetest info.c testlist.c) set_module_type(winspool_winetest win32cui) add_importlibs(winspool_winetest winspool advapi32 msvcrt kernel32) -add_cd_file(TARGET winspool_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET winspool_winetest) diff --git a/rostests/winetests/wintrust/CMakeLists.txt b/rostests/winetests/wintrust/CMakeLists.txt index abcba1f7573..7268d37fa66 100644 --- a/rostests/winetests/wintrust/CMakeLists.txt +++ b/rostests/winetests/wintrust/CMakeLists.txt @@ -11,4 +11,4 @@ list(APPEND SOURCE add_executable(wintrust_winetest ${SOURCE}) set_module_type(wintrust_winetest win32cui) add_importlibs(wintrust_winetest wintrust crypt32 advapi32 msvcrt kernel32) -add_cd_file(TARGET wintrust_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET wintrust_winetest) diff --git a/rostests/winetests/wldap32/CMakeLists.txt b/rostests/winetests/wldap32/CMakeLists.txt index 73cc0f9bf33..69193279808 100644 --- a/rostests/winetests/wldap32/CMakeLists.txt +++ b/rostests/winetests/wldap32/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(wldap32_winetest parse.c testlist.c) set_module_type(wldap32_winetest win32cui) add_importlibs(wldap32_winetest wldap32 msvcrt kernel32) -add_cd_file(TARGET wldap32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET wldap32_winetest) diff --git a/rostests/winetests/wmiutils/CMakeLists.txt b/rostests/winetests/wmiutils/CMakeLists.txt index 38b67c73c28..0aefcbade67 100644 --- a/rostests/winetests/wmiutils/CMakeLists.txt +++ b/rostests/winetests/wmiutils/CMakeLists.txt @@ -6,4 +6,4 @@ add_definitions( add_executable(wmiutils_winetest path.c testlist.c) set_module_type(wmiutils_winetest win32cui) add_importlibs(wmiutils_winetest ole32 msvcrt kernel32 ntdll) -add_cd_file(TARGET wmiutils_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET wmiutils_winetest) diff --git a/rostests/winetests/ws2_32/CMakeLists.txt b/rostests/winetests/ws2_32/CMakeLists.txt index 55593fffb84..24284449073 100644 --- a/rostests/winetests/ws2_32/CMakeLists.txt +++ b/rostests/winetests/ws2_32/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) add_executable(ws2_32_winetest protocol.c sock.c testlist.c) set_module_type(ws2_32_winetest win32cui) add_importlibs(ws2_32_winetest ws2_32 user32 msvcrt kernel32) -add_cd_file(TARGET ws2_32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET ws2_32_winetest) if(NOT MSVC) add_target_compile_flags(ws2_32_winetest "-Wno-format") diff --git a/rostests/winetests/wscript/CMakeLists.txt b/rostests/winetests/wscript/CMakeLists.txt index 1f262a6b80c..ace5b03e3e9 100644 --- a/rostests/winetests/wscript/CMakeLists.txt +++ b/rostests/winetests/wscript/CMakeLists.txt @@ -4,4 +4,4 @@ add_executable(wscript_winetest run.c testlist.c rsrc.rc) target_link_libraries(wscript_winetest uuid) set_module_type(wscript_winetest win32cui) add_importlibs(wscript_winetest ole32 oleaut32 psapi advapi32 msvcrt kernel32) -add_cd_file(TARGET wscript_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET wscript_winetest) diff --git a/rostests/winetests/wshom/CMakeLists.txt b/rostests/winetests/wshom/CMakeLists.txt index b736d784e39..02da2c51087 100644 --- a/rostests/winetests/wshom/CMakeLists.txt +++ b/rostests/winetests/wshom/CMakeLists.txt @@ -8,4 +8,4 @@ add_executable(wshom_winetest wshom.c testlist.c) set_module_type(wshom_winetest win32cui) add_importlibs(wshom_winetest oleaut32 ole32 advapi32 msvcrt kernel32) add_dependencies(wshom_winetest stdole2 wshom_winetest_idlheaders) -add_cd_file(TARGET wshom_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET wshom_winetest) diff --git a/rostests/winetests/wtsapi32/CMakeLists.txt b/rostests/winetests/wtsapi32/CMakeLists.txt index e5a653380e2..5a9d1b67e70 100644 --- a/rostests/winetests/wtsapi32/CMakeLists.txt +++ b/rostests/winetests/wtsapi32/CMakeLists.txt @@ -3,4 +3,4 @@ add_definitions(-DUSE_WINE_TODOS) add_executable(wtsapi32_winetest wtsapi.c testlist.c) set_module_type(wtsapi32_winetest win32cui) add_importlibs(wtsapi32_winetest wtsapi32 msvcrt kernel32) -add_cd_file(TARGET wtsapi32_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET wtsapi32_winetest) diff --git a/rostests/winetests/xcopy/CMakeLists.txt b/rostests/winetests/xcopy/CMakeLists.txt index bcba418691f..5282ed04fd5 100644 --- a/rostests/winetests/xcopy/CMakeLists.txt +++ b/rostests/winetests/xcopy/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(xcopy_winetest xcopy.c testlist.c) set_module_type(xcopy_winetest win32cui) add_importlibs(xcopy_winetest msvcrt kernel32) -add_cd_file(TARGET xcopy_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET xcopy_winetest) diff --git a/rostests/winetests/xinput1_3/CMakeLists.txt b/rostests/winetests/xinput1_3/CMakeLists.txt index 44cb1a8f17f..90da4f22233 100644 --- a/rostests/winetests/xinput1_3/CMakeLists.txt +++ b/rostests/winetests/xinput1_3/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(xinput1_3_winetest xinput.c testlist.c) set_module_type(xinput1_3_winetest win32cui) add_importlibs(xinput1_3_winetest user32 msvcrt kernel32) -add_cd_file(TARGET xinput1_3_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET xinput1_3_winetest) diff --git a/rostests/winetests/xmllite/CMakeLists.txt b/rostests/winetests/xmllite/CMakeLists.txt index c44515f3a86..4ec49647595 100644 --- a/rostests/winetests/xmllite/CMakeLists.txt +++ b/rostests/winetests/xmllite/CMakeLists.txt @@ -9,4 +9,4 @@ list(APPEND SOURCE add_executable(xmllite_winetest ${SOURCE}) set_module_type(xmllite_winetest win32cui) add_importlibs(xmllite_winetest xmllite ole32 msvcrt kernel32) -add_cd_file(TARGET xmllite_winetest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET xmllite_winetest)