Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-07 06:53:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
* Addendum to r64795.
* Also remove unneeded wine linking and ntdll importing.
* Remove redundant defines.

svn path=/trunk/; revision=64796
This commit is contained in:
Amine Khaldi 2014-10-17 23:29:24 +00:00
parent 2bdcf8789d
commit c0e495f046
54 changed files with 67 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rostests/apitests/CMakeLists.txt
View file

@ -1,5 +1,4 @@
include_directories(
include)
include_directories(include)
add_library(apitest apitest.c)
@ -10,7 +9,7 @@ add_subdirectory(crt)
add_subdirectory(dciman32)
add_subdirectory(gdi32)
if(NOT ARCH STREQUAL "amd64")
add_subdirectory(kernel32)
add_subdirectory(kernel32)
endif()
add_subdirectory(msvcrt)
add_subdirectory(ntdll)

1
rostests/apitests/com/CMakeLists.txt
View file

@ -13,5 +13,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)

1
rostests/apitests/crt/CMakeLists.txt
View file

@ -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()

2
rostests/apitests/crt/ntdll_crt_apitest.cmake
View file

@ -151,11 +151,9 @@ elseif(ARCH STREQUAL "amd64")
)
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)

1
rostests/apitests/dciman32/CMakeLists.txt
View file

@ -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)

5
rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt
View file

@ -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)

6
rostests/apitests/psapi/CMakeLists.txt
View file

@ -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)

7
rostests/apitests/shell32/CMakeLists.txt
View file

@ -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)

1
rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt
View file

@ -7,5 +7,4 @@ add_library(w32kdll_2k3sp2 SHARED
${CMAKE_CURRENT_BINARY_DIR}/w32kdll_2k3sp2.def)
set_entrypoint(w32kdll_2k3sp2 0)
add_dependencies(w32kdll_2k3sp2 psdk)

3
rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt
View file

@ -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)
set_entrypoint(w32kdll_2ksp4 0)
add_dependencies(w32kdll_2ksp4 psdk)

1
rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt
View file

@ -7,5 +7,4 @@ add_library(w32kdll_ros SHARED
${CMAKE_CURRENT_BINARY_DIR}/w32kdll_ros.def)
set_entrypoint(w32kdll_ros 0)
add_dependencies(w32kdll_ros psdk)

2
rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt
View file

@ -5,6 +5,6 @@ add_library(w32kdll_vista SHARED
main.c
w32kdll_vista.S
${CMAKE_CURRENT_BINARY_DIR}/w32kdll_vista.def)
set_entrypoint(w32kdll_vista 0)
set_entrypoint(w32kdll_vista 0)
add_dependencies(w32kdll_vista psdk )

3
rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt
View file

@ -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)
set_entrypoint(w32kdll_xpsp2 0)
add_dependencies(w32kdll_xpsp2 psdk)

7
rostests/apitests/winhttp/CMakeLists.txt
View file

@ -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)

7
rostests/apitests/wininet/CMakeLists.txt
View file

@ -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)