[akhaldi] 64796: [CMAKE] * Addendum to r64795. * Also remove unneeded wine linking and ntdll importing. * Remove redundant defines.
Author: akhaldi Date: Fri Oct 17 23:29:24 2014 New Revision: 64796
URL: http://svn.reactos.org/svn/reactos?rev=64796&view=rev Log: [CMAKE] * Addendum to r64795. * Also remove unneeded wine linking and ntdll importing. * Remove redundant defines.
Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/apitests/com/CMakeLists.txt trunk/rostests/apitests/crt/CMakeLists.txt trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake trunk/rostests/apitests/dciman32/CMakeLists.txt trunk/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt trunk/rostests/apitests/psapi/CMakeLists.txt trunk/rostests/apitests/shell32/CMakeLists.txt trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt trunk/rostests/apitests/winhttp/CMakeLists.txt trunk/rostests/apitests/wininet/CMakeLists.txt trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/example/CMakeLists.txt trunk/rostests/kmtests/kernel32/CMakeLists.txt trunk/rostests/kmtests/ntos_io/CMakeLists.txt trunk/rostests/rosautotest/CMakeLists.txt trunk/rostests/tests/CMakeLists.txt trunk/rostests/tests/dllexport/CMakeLists.txt trunk/rostests/tests/mmixer_test/CMakeLists.txt trunk/rostests/winetests/CMakeLists.txt trunk/rostests/winetests/atl/CMakeLists.txt trunk/rostests/winetests/cmd/CMakeLists.txt trunk/rostests/winetests/dnsapi/CMakeLists.txt trunk/rostests/winetests/gdi32/CMakeLists.txt trunk/rostests/winetests/icmp/CMakeLists.txt trunk/rostests/winetests/iphlpapi/CMakeLists.txt trunk/rostests/winetests/mshtml/CMakeLists.txt trunk/rostests/winetests/msvcrt/CMakeLists.txt trunk/rostests/winetests/msxml3/CMakeLists.txt trunk/rostests/winetests/netapi32/CMakeLists.txt trunk/rostests/winetests/ntdll/CMakeLists.txt trunk/rostests/winetests/oleaut32/CMakeLists.txt trunk/rostests/winetests/pdh/CMakeLists.txt trunk/rostests/winetests/propsys/CMakeLists.txt trunk/rostests/winetests/qmgr/CMakeLists.txt trunk/rostests/winetests/quartz/CMakeLists.txt trunk/rostests/winetests/regedit/CMakeLists.txt trunk/rostests/winetests/rpcrt4/CMakeLists.txt trunk/rostests/winetests/serialui/CMakeLists.txt trunk/rostests/winetests/services/CMakeLists.txt trunk/rostests/winetests/shell32/CMakeLists.txt trunk/rostests/winetests/shlwapi/CMakeLists.txt trunk/rostests/winetests/sxs/CMakeLists.txt trunk/rostests/winetests/userenv/CMakeLists.txt trunk/rostests/winetests/uxtheme/CMakeLists.txt trunk/rostests/winetests/version/CMakeLists.txt trunk/rostests/winetests/windowscodecs/CMakeLists.txt trunk/rostests/winetests/windowscodecsext/CMakeLists.txt trunk/rostests/winetests/winmm/CMakeLists.txt trunk/rostests/winetests/wlanapi/CMakeLists.txt
Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?re... ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,5 +1,4 @@ -include_directories( - include) +include_directories(include)
add_library(apitest apitest.c)
@@ -10,7 +9,7 @@ add_subdirectory(dciman32) add_subdirectory(gdi32) if(NOT ARCH STREQUAL "amd64") -add_subdirectory(kernel32) + add_subdirectory(kernel32) endif() add_subdirectory(msvcrt) add_subdirectory(ntdll)
Modified: trunk/rostests/apitests/com/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/CMakeLists.tx... ============================================================================== --- trunk/rostests/apitests/com/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/com/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -13,5 +13,4 @@ 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)
Modified: trunk/rostests/apitests/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/CMakeLists.tx... ============================================================================== --- trunk/rostests/apitests/crt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,6 +1,7 @@
include(ntdll_crt_apitest.cmake) include(msvcrt_crt_apitest.cmake) + if(NOT ARCH STREQUAL "amd64") include(crtdll_crt_apitest.cmake) endif()
Modified: trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/ntdll_crt_api... ============================================================================== --- trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -151,11 +151,9 @@ ) endif()
- add_executable(ntdll_crt_apitest testlist.c ${SOURCE_NTDLL}) 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) -
Modified: trunk/rostests/apitests/dciman32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/CMakeLis... ============================================================================== --- trunk/rostests/apitests/dciman32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/dciman32/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,6 +1,5 @@
add_definitions(-D_DLL -D__USE_CRTIMP) - add_executable(dciman32_apitest DCICreatePrimary.c testlist.c) target_link_libraries(dciman32_apitest wine) set_module_type(dciman32_apitest win32cui)
Modified: trunk/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CmdLineUti... ============================================================================== --- trunk/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,8 +1,5 @@
-list(APPEND SOURCE - CmdLineUtil.c) - -add_executable(CmdLineUtil ${SOURCE}) +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/data FOR all)
Modified: trunk/rostests/apitests/psapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/psapi/CMakeLists.... ============================================================================== --- trunk/rostests/apitests/psapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/psapi/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,9 +1,5 @@
-list(APPEND SOURCE - psapi.c - testlist.c) - -add_executable(psapi_apitest ${SOURCE}) +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)
Modified: trunk/rostests/apitests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CMakeList... ============================================================================== --- trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,11 +1,6 @@
set_cpp(WITH_RUNTIME) - -list(APPEND SOURCE - menu.cpp - testlist.c) - -add_executable(shell32_apitest ${SOURCE}) +add_executable(shell32_apitest menu.cpp testlist.c) target_link_libraries(shell32_apitest wine uuid) set_module_type(shell32_apitest win32cui) add_importlibs(shell32_apitest msvcrt kernel32 user32 gdi32 shell32 ole32 shlwapi)
Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_2... ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -7,5 +7,4 @@ ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_2k3sp2.def)
set_entrypoint(w32kdll_2k3sp2 0) - add_dependencies(w32kdll_2k3sp2 psdk)
Modified: trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_2... ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,9 +1,10 @@ + spec2def(w32kdll_2ksp4.dll w32kdll_2ksp4.spec)
add_library(w32kdll_2ksp4 SHARED main.c w32kdll_2ksp4.S ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_2ksp4.def) + set_entrypoint(w32kdll_2ksp4 0) - add_dependencies(w32kdll_2ksp4 psdk)
Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_r... ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -7,5 +7,4 @@ ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_ros.def)
set_entrypoint(w32kdll_ros 0) - add_dependencies(w32kdll_ros psdk)
Modified: trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_v... ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -5,6 +5,6 @@ main.c w32kdll_vista.S ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_vista.def) + set_entrypoint(w32kdll_vista 0) - add_dependencies(w32kdll_vista psdk )
Modified: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_x... ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,9 +1,10 @@ + spec2def(w32kdll_xpsp2.dll w32kdll_xpsp2.spec ADD_IMPORTLIB)
add_library(w32kdll_xpsp2 SHARED main.c sys-stubs.S ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_xpsp2.def) + set_entrypoint(w32kdll_xpsp2 0) - add_dependencies(w32kdll_xpsp2 psdk)
Modified: trunk/rostests/apitests/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winhttp/CMakeList... ============================================================================== --- trunk/rostests/apitests/winhttp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/winhttp/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,12 +1,7 @@
-list(APPEND SOURCE - WinHttpOpen.c - testlist.c) - -add_executable(winhttp_apitest ${SOURCE}) +add_executable(winhttp_apitest WinHttpOpen.c testlist.c) target_link_libraries(winhttp_apitest wine) set_module_type(winhttp_apitest win32cui) add_importlibs(winhttp_apitest msvcrt kernel32 ntdll) #add_delay_importlibs(winhttp_apitest winhttp) - add_cd_file(TARGET winhttp_apitest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/apitests/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wininet/CMakeList... ============================================================================== --- trunk/rostests/apitests/wininet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/wininet/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,12 +1,7 @@
-list(APPEND SOURCE - InternetOpen.c - testlist.c) - -add_executable(wininet_apitest ${SOURCE}) +add_executable(wininet_apitest InternetOpen.c testlist.c) target_link_libraries(wininet_apitest wine) set_module_type(wininet_apitest win32cui) add_importlibs(wininet_apitest msvcrt kernel32 ntdll) #add_delay_importlibs(wininet_apitest wininet) - add_cd_file(TARGET wininet_apitest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?rev... ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,5 +1,5 @@ -include_directories( - include) + +include_directories(include)
# # subdirectories containing special-purpose drivers @@ -77,14 +77,12 @@ kmtest_drv/kmtest_drv.rc)
add_library(kmtest_drv SHARED ${KMTEST_DRV_SOURCE}) - set_module_type(kmtest_drv kernelmodedriver) target_link_libraries(kmtest_drv kmtest_printf chkstk ${PSEH_LIB}) add_importlibs(kmtest_drv ntoskrnl hal) add_dependencies(kmtest_drv bugcodes) 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_library(kmtest_printf @@ -118,7 +116,6 @@ add_importlibs(kmtest advapi32 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)
Modified: trunk/rostests/kmtests/example/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/example/CMakeLists... ============================================================================== --- trunk/rostests/kmtests/example/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/example/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,16 +1,14 @@ -include_directories( - ../include) + +include_directories(../include)
list(APPEND EXAMPLE_DRV_SOURCE ../kmtest_drv/kmtest_standalone.c Example_drv.c)
add_library(example_drv SHARED ${EXAMPLE_DRV_SOURCE}) - set_module_type(example_drv kernelmodedriver) 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)
Modified: trunk/rostests/kmtests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kernel32/CMakeList... ============================================================================== --- trunk/rostests/kmtests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/kernel32/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,16 +1,14 @@ -include_directories( - ../include) + +include_directories(../include)
list(APPEND FINDFILE_DRV_SOURCE ../kmtest_drv/kmtest_standalone.c FindFile_drv.c)
add_library(findfile_drv SHARED ${FINDFILE_DRV_SOURCE}) - set_module_type(findfile_drv kernelmodedriver) 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)
Modified: trunk/rostests/kmtests/ntos_io/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/CMakeLists... ============================================================================== --- trunk/rostests/kmtests/ntos_io/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_io/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,5 +1,5 @@ -include_directories( - ../include) + +include_directories(../include)
# # IoDeviceObject @@ -9,13 +9,11 @@ IoDeviceObject_drv.c)
add_library(iodeviceobject_drv SHARED ${IODEVICEOBJECT_DRV_SOURCE}) - set_module_type(iodeviceobject_drv kernelmodedriver) 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)
# @@ -26,11 +24,9 @@ IoHelper_drv.c)
add_library(iohelper_drv SHARED ${IOHELPER_DRV_SOURCE}) - set_module_type(iohelper_drv kernelmodedriver) 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)
Modified: trunk/rostests/rosautotest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CMakeLists.txt... ============================================================================== --- trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -21,7 +21,6 @@ precomp.h)
add_executable(rosautotest ${SOURCE} ${REACTOS_BINARY_DIR}/include/reactos/rosautotestmsg.rc) - set_module_type(rosautotest win32cui UNICODE) add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll) add_pch(rosautotest precomp.h SOURCE)
Modified: trunk/rostests/tests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/CMakeLists.txt?rev=6... ============================================================================== --- trunk/rostests/tests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/tests/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,5 +1,5 @@ add_subdirectory(mmixer_test) -if (NOT MSVC) +if(NOT MSVC) add_subdirectory(pseh2) endif() add_subdirectory(dllexport)
Modified: trunk/rostests/tests/dllexport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/dllexport/CMakeLists... ============================================================================== --- trunk/rostests/tests/dllexport/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/tests/dllexport/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -3,21 +3,23 @@ spec2def(dllexport_test_dll2.dll dllexport_test_dll2.spec ADD_IMPORTLIB)
set(baseaddress_dllexport_test_dll1 0x1000000) + add_library(dllexport_test_dll1 SHARED dllexport_test_dll1.c ${CMAKE_CURRENT_BINARY_DIR}/dllexport_test_dll1.def) + set_module_type(dllexport_test_dll1 module) add_importlibs(dllexport_test_dll1 dllexport_test_dll2)
set(baseaddress_dllexport_test_dll2 0x2000000) + add_library(dllexport_test_dll2 SHARED dllexport_test_dll2.c ${CMAKE_CURRENT_BINARY_DIR}/dllexport_test_dll2.def) + set_module_type(dllexport_test_dll2 module)
-add_executable(dllexport_test - dllexport_test.c) - +add_executable(dllexport_test dllexport_test.c) set_module_type(dllexport_test win32cui) add_importlibs(dllexport_test dllexport_test_dll1 msvcrt kernel32 ntdll)
@@ -25,10 +27,10 @@ add_compile_flags("/Zc:wchar_t-") endif()
-add_library(dllimport_test SHARED - dllimport_framedyn.cpp) +add_library(dllimport_test SHARED dllimport_framedyn.cpp) set_module_type(dllimport_test module) add_importlibs(dllimport_test framedyn) + if(NOT MSVC) target_link_libraries(dllimport_test framedynex) endif()
Modified: trunk/rostests/tests/mmixer_test/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/mmixer_test/CMakeLis... ============================================================================== --- trunk/rostests/tests/mmixer_test/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/tests/mmixer_test/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,11 +1,8 @@
add_definitions(-D_DLL -D__USE_CRTIMP) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer) - add_executable(mmixer_test test.c) set_module_type(mmixer_test win32cui) - target_link_libraries(mmixer_test mmixer) add_importlibs(mmixer_test advapi32 setupapi winmm ksuser user32 msvcrt kernel32)
Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?r... ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -80,7 +80,7 @@ add_subdirectory(riched20) add_subdirectory(riched32) if(NOT ARCH STREQUAL "amd64") -add_subdirectory(rpcrt4) + add_subdirectory(rpcrt4) endif() add_subdirectory(rsaenh) add_subdirectory(schannel)
Modified: trunk/rostests/winetests/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/CMakeLists.t... ============================================================================== --- trunk/rostests/winetests/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,3 +1,4 @@ + add_definitions(-D_ATL_VER=_ATL_VER_30)
list(APPEND SOURCE
Modified: trunk/rostests/winetests/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/CMakeLists.t... ============================================================================== --- trunk/rostests/winetests/cmd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/cmd/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,7 +1,5 @@
-add_definitions(-D__ROS_LONG64__) add_executable(cmd_winetest batch.c testlist.c rsrc.rc) -target_link_libraries(cmd_winetest wine) set_module_type(cmd_winetest win32cui) -add_importlibs(cmd_winetest msvcrt kernel32 ntdll) +add_importlibs(cmd_winetest msvcrt kernel32) add_cd_file(TARGET cmd_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/CMakeList... ============================================================================== --- trunk/rostests/winetests/dnsapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/dnsapi/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,5 +1,4 @@
-add_definitions(-D__ROS_LONG64__) add_executable(dnsapi_winetest name.c record.c testlist.c) set_module_type(dnsapi_winetest win32cui) add_importlibs(dnsapi_winetest dnsapi msvcrt kernel32)
Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/CMakeLists... ============================================================================== --- trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -21,7 +21,9 @@ add_executable(gdi32_winetest ${SOURCE} resource.rc) set_module_type(gdi32_winetest win32cui) add_importlibs(gdi32_winetest gdi32 user32 advapi32 msvcrt kernel32) + if(MSVC) add_importlibs(gdi32_winetest ntdll) endif() + add_cd_file(TARGET gdi32_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/icmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/icmp/CMakeLists.... ============================================================================== --- trunk/rostests/winetests/icmp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/icmp/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,7 +1,3 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP)
add_executable(icmp_winetest icmp.c testlist.c) target_link_libraries(icmp_winetest wine uuid)
Modified: trunk/rostests/winetests/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/iphlpapi/CMakeLi... ============================================================================== --- trunk/rostests/winetests/iphlpapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/iphlpapi/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,7 +1,3 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP)
add_executable(iphlpapi_winetest iphlpapi.c testlist.c) target_link_libraries(iphlpapi_winetest wine)
Modified: trunk/rostests/winetests/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/CMakeList... ============================================================================== --- trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,6 +1,5 @@
add_definitions(-DUSE_WINE_TODOS) - add_idl_Headers(test_tlb_header test_tlb.idl) add_typelib(test_tlb.idl)
@@ -29,7 +28,6 @@ ${CMAKE_CURRENT_SOURCE_DIR}/externscr.js)
set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${mshtml_winetest_rc_deps}") - 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)
Modified: trunk/rostests/winetests/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/CMakeList... ============================================================================== --- trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -21,7 +21,6 @@ time.c)
add_executable(msvcrt_winetest ${SOURCE}) - set_module_type(msvcrt_winetest win32cui) add_importlibs(msvcrt_winetest msvcrt kernel32)
Modified: trunk/rostests/winetests/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/CMakeList... ============================================================================== --- trunk/rostests/winetests/msxml3/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -16,7 +16,9 @@ add_dependencies(msxml3_winetest xmlparser_idlheader_test) set_module_type(msxml3_winetest win32cui) add_importlibs(msxml3_winetest user32 ole32 oleaut32 msvcrt kernel32) + if(MSVC) add_importlibs(msxml3_winetest ntdll) endif() + add_cd_file(TARGET msxml3_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/CMakeLi... ============================================================================== --- trunk/rostests/winetests/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/netapi32/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,5 +1,3 @@ - -add_definitions(-D__ROS_LONG64__)
list(APPEND SOURCE access.c @@ -9,7 +7,7 @@ testlist.c)
add_executable(netapi32_winetest ${SOURCE}) -target_link_libraries(netapi32_winetest wine) +target_link_libraries(netapi32_winetest) set_module_type(netapi32_winetest win32cui) -add_importlibs(netapi32_winetest advapi32 msvcrt kernel32 ntdll) +add_importlibs(netapi32_winetest advapi32 msvcrt kernel32) add_cd_file(TARGET netapi32_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/CMakeLists... ============================================================================== --- trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -30,6 +30,7 @@ set_module_type(ntdll_winetest win32cui) add_importlibs(ntdll_winetest user32 msvcrt kernel32 ntdll) add_cd_file(TARGET ntdll_winetest DESTINATION reactos/bin FOR all) + if(NOT MSVC) allow_warnings(ntdll_winetest) add_target_compile_flags(ntdll_winetest "-Wno-format")
Modified: trunk/rostests/winetests/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/CMakeLi... ============================================================================== --- trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -27,13 +27,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/tmarshal.tlb)
set_source_files_properties(tmarshal.rc PROPERTIES OBJECT_DEPENDS "${tmarshal.rc_DEPS}") - add_executable(oleaut32_winetest ${SOURCE} tmarshal.rc) target_link_libraries(oleaut32_winetest uuid) set_module_type(oleaut32_winetest win32cui) add_importlibs(oleaut32_winetest oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32) + if(MSVC) add_importlibs(oleaut32_winetest ntdll) endif() + add_dependencies(oleaut32_winetest stdole2 oleaut32_idlheaders) add_cd_file(TARGET oleaut32_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/pdh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/pdh/CMakeLists.t... ============================================================================== --- trunk/rostests/winetests/pdh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/pdh/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -2,7 +2,9 @@ add_executable(pdh_winetest pdh.c testlist.c) set_module_type(pdh_winetest win32cui) add_importlibs(pdh_winetest pdh msvcrt kernel32) + if(MSVC) add_importlibs(pdh_winetest ntdll) endif() + add_cd_file(TARGET pdh_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/propsys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/propsys/CMakeLis... ============================================================================== --- trunk/rostests/winetests/propsys/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/propsys/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -3,7 +3,9 @@ add_executable(propsys_winetest propstore.c propsys.c testlist.c) set_module_type(propsys_winetest win32cui) add_importlibs(propsys_winetest propsys ole32 oleaut32 msvcrt kernel32) + if(MSVC) add_importlibs(propsys_winetest ntdll) endif() + add_cd_file(TARGET propsys_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/qmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qmgr/CMakeLists.... ============================================================================== --- trunk/rostests/winetests/qmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/qmgr/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -10,7 +10,9 @@ add_executable(qmgr_winetest ${SOURCE}) set_module_type(qmgr_winetest win32cui) add_importlibs(qmgr_winetest ole32 shlwapi user32 msvcrt kernel32) + if(MSVC) add_importlibs(qmgr_winetest ntdll) endif() + add_cd_file(TARGET qmgr_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/CMakeList... ============================================================================== --- trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -16,7 +16,9 @@ add_dependencies(quartz_winetest quartz_test_idlheader) set_module_type(quartz_winetest win32cui) add_importlibs(quartz_winetest ole32 oleaut32 advapi32 msvcrt kernel32) + if(MSVC) add_importlibs(quartz_winetest ntdll) endif() + add_cd_file(TARGET quartz_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/regedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/regedit/CMakeLis... ============================================================================== --- trunk/rostests/winetests/regedit/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/regedit/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,7 +1,3 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP)
add_executable(regedit_winetest regedit.c testlist.c) target_link_libraries(regedit_winetest wine)
Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeList... ============================================================================== --- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -2,11 +2,8 @@ remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
add_definitions(-DUSE_WINE_TODOS) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) - set(IDL_FLAGS ${IDL_FLAGS} --prefix-server=s_) - add_rpc_files(client server.idl) add_rpc_files(server server.idl) unset(IDL_FLAGS) @@ -29,11 +26,7 @@ endif()
add_executable(rpcrt4_winetest ${SOURCE}) -target_link_libraries(rpcrt4_winetest - uuid - wine - ${PSEH_LIB}) - +target_link_libraries(rpcrt4_winetest uuid wine ${PSEH_LIB}) set_module_type(rpcrt4_winetest win32cui) add_importlibs(rpcrt4_winetest ole32 rpcrt4 msvcrt kernel32 ntdll) add_cd_file(TARGET rpcrt4_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/serialui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/serialui/CMakeLi... ============================================================================== --- trunk/rostests/winetests/serialui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/serialui/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP)
add_executable(serialui_winetest confdlg.c testlist.c) -target_link_libraries(serialui_winetest wine) set_module_type(serialui_winetest win32cui) -add_importlibs(serialui_winetest msvcrt kernel32 ntdll) +add_importlibs(serialui_winetest msvcrt kernel32) add_cd_file(TARGET serialui_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/services/CMakeLi... ============================================================================== --- trunk/rostests/winetests/services/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/services/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,7 +1,5 @@
-add_definitions(-D__ROS_LONG64__) add_executable(services_winetest service.c testlist.c) -target_link_libraries(services_winetest wine) set_module_type(services_winetest win32cui) -add_importlibs(services_winetest advapi32 msvcrt kernel32 ntdll) +add_importlibs(services_winetest advapi32 msvcrt kernel32) add_cd_file(TARGET services_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/CMakeLis... ============================================================================== --- trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -28,7 +28,9 @@ target_link_libraries(shell32_winetest uuid) set_module_type(shell32_winetest win32cui) add_importlibs(shell32_winetest shell32 ole32 oleaut32 user32 advapi32 msvcrt kernel32) + if(MSVC) add_importlibs(shell32_winetest ntdll) endif() + add_cd_file(TARGET shell32_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/CMakeLis... ============================================================================== --- trunk/rostests/winetests/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -19,7 +19,9 @@ target_link_libraries(shlwapi_winetest uuid) set_module_type(shlwapi_winetest win32cui) add_importlibs(shlwapi_winetest shlwapi ole32 oleaut32 user32 advapi32 msvcrt kernel32) + if(MSVC) add_importlibs(shlwapi_winetest ntdll) endif() + add_cd_file(TARGET shlwapi_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/sxs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/sxs/CMakeLists.t... ============================================================================== --- trunk/rostests/winetests/sxs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/sxs/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,11 +1,6 @@
add_definitions(-DUSE_WINE_TODOS) - -add_executable(sxs_winetest - cache.c - name.c - testlist.c) - +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)
Modified: trunk/rostests/winetests/userenv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/userenv/CMakeLis... ============================================================================== --- trunk/rostests/winetests/userenv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/userenv/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP)
add_executable(userenv_winetest userenv.c testlist.c) -target_link_libraries(userenv_winetest wine) set_module_type(userenv_winetest win32cui) -add_importlibs(userenv_winetest userenv advapi32 msvcrt kernel32 ntdll) +add_importlibs(userenv_winetest userenv advapi32 msvcrt kernel32) add_cd_file(TARGET userenv_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/uxtheme/CMakeLis... ============================================================================== --- trunk/rostests/winetests/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/uxtheme/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP)
add_executable(uxtheme_winetest system.c testlist.c) -target_link_libraries(uxtheme_winetest wine) set_module_type(uxtheme_winetest win32cui) -add_importlibs(uxtheme_winetest user32 msvcrt kernel32 ntdll) +add_importlibs(uxtheme_winetest user32 msvcrt kernel32) add_cd_file(TARGET uxtheme_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/CMakeLis... ============================================================================== --- trunk/rostests/winetests/version/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/version/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -9,7 +9,9 @@ add_executable(version_winetest ${SOURCE} version.rc) set_module_type(version_winetest win32cui) add_importlibs(version_winetest version msvcrt kernel32) + if(MSVC) add_importlibs(version_winetest ntdll) endif() + add_cd_file(TARGET version_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/CM... ============================================================================== --- trunk/rostests/winetests/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -19,7 +19,9 @@ add_executable(windowscodecs_winetest ${SOURCE}) set_module_type(windowscodecs_winetest win32cui) add_importlibs(windowscodecs_winetest windowscodecs oleaut32 ole32 user32 gdi32 msvcrt kernel32) + if(MSVC) add_importlibs(windowscodecs_winetest ntdll) endif() + add_cd_file(TARGET windowscodecs_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/windowscodecsext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecsext... ============================================================================== --- trunk/rostests/winetests/windowscodecsext/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecsext/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,9 +1,5 @@
-list(APPEND SOURCE - transform.c - testlist.c) - -add_executable(windowscodecsext_winetest ${SOURCE}) +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)
Modified: trunk/rostests/winetests/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/CMakeLists... ============================================================================== --- trunk/rostests/winetests/winmm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/winmm/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,5 +1,3 @@ - -add_definitions(-D__ROS_LONG64__)
list(APPEND SOURCE capture.c @@ -11,9 +9,9 @@ wave.c)
add_executable(winmm_winetest ${SOURCE}) -target_link_libraries(winmm_winetest wine dxguid) +target_link_libraries(winmm_winetest dxguid) set_module_type(winmm_winetest win32cui) -add_importlibs(winmm_winetest winmm user32 msvcrt kernel32 ntdll) +add_importlibs(winmm_winetest winmm user32 msvcrt kernel32) add_cd_file(TARGET winmm_winetest DESTINATION reactos/bin FOR all)
if(NOT MSVC)
Modified: trunk/rostests/winetests/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wlanapi/CMakeLis... ============================================================================== --- trunk/rostests/winetests/wlanapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/wlanapi/CMakeLists.txt [iso-8859-1] Fri Oct 17 23:29:24 2014 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP)
add_executable(wlanapi_winetest wlanapi.c testlist.c) -target_link_libraries(wlanapi_winetest wine) set_module_type(wlanapi_winetest win32cui) -add_importlibs(wlanapi_winetest wlanapi msvcrt kernel32 ntdll) +add_importlibs(wlanapi_winetest wlanapi msvcrt kernel32) add_cd_file(TARGET wlanapi_winetest DESTINATION reactos/bin FOR all)
-
akhaldi＠svn.reactos.org