From 08265cb0956dd9b8ca29123afef0e1e15dde3d3e Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 5 Oct 2010 13:03:47 +0000 Subject: [PATCH] [CMAKE] Alexey Komarov: - More work on base modules. - Add some dlls to build. svn path=/branches/cmake-bringup/; revision=48996 --- base/CMakeLists.txt | 2 +- base/services/CMakeLists.txt | 18 +++++++------- base/services/audiosrv/CMakeLists.txt | 15 ++++++++++++ base/services/eventlog/CMakeLists.txt | 21 ++++++++++++++++ base/services/rpcss/CMakeLists.txt | 19 ++++++++++++++ base/services/spoolsv/CMakeLists.txt | 9 +++++++ base/services/svchost/CMakeLists.txt | 5 ++++ base/services/tcpsvcs/CMakeLists.txt | 20 +++++++++++++++ base/services/telnetd/CMakeLists.txt | 11 +++++++++ base/services/tftpd/CMakeLists.txt | 7 ++++++ base/services/umpnpmgr/CMakeLists.txt | 16 ++++++++++++ base/services/wlansvc/CMakeLists.txt | 14 +++++++++++ base/setup/CMakeLists.txt | 8 +++--- base/setup/reactos/CMakeLists.txt | 16 ++++++++++++ base/setup/setup/CMakeLists.txt | 9 +++++++ base/setup/vmwinst/CMakeLists.txt | 19 ++++++++++++++ base/setup/welcome/CMakeLists.txt | 9 +++++++ base/shell/CMakeLists.txt | 2 +- base/shell/explorer-new/CMakeLists.txt | 34 ++++++++++++++++++++++++++ dll/win32/CMakeLists.txt | 6 ++--- dll/win32/userenv/CMakeLists.txt | 28 +++++++++++++++++++++ dll/win32/vdmdbg/CMakeLists.txt | 18 ++++++++++++++ dll/win32/version/CMakeLists.txt | 20 +++++++++++++++ dll/win32/wdmaud.drv/CMakeLists.txt | 2 +- dll/win32/wuapi/CMakeLists.txt | 2 +- 25 files changed, 310 insertions(+), 20 deletions(-) create mode 100644 base/services/audiosrv/CMakeLists.txt create mode 100644 base/services/eventlog/CMakeLists.txt create mode 100644 base/services/rpcss/CMakeLists.txt create mode 100644 base/services/spoolsv/CMakeLists.txt create mode 100644 base/services/svchost/CMakeLists.txt create mode 100644 base/services/tcpsvcs/CMakeLists.txt create mode 100644 base/services/telnetd/CMakeLists.txt create mode 100644 base/services/tftpd/CMakeLists.txt create mode 100644 base/services/umpnpmgr/CMakeLists.txt create mode 100644 base/services/wlansvc/CMakeLists.txt create mode 100644 base/setup/reactos/CMakeLists.txt create mode 100644 base/setup/setup/CMakeLists.txt create mode 100644 base/setup/vmwinst/CMakeLists.txt create mode 100644 base/setup/welcome/CMakeLists.txt create mode 100644 base/shell/explorer-new/CMakeLists.txt create mode 100644 dll/win32/userenv/CMakeLists.txt create mode 100644 dll/win32/vdmdbg/CMakeLists.txt create mode 100644 dll/win32/version/CMakeLists.txt diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index 42f541d64d4..5dafa0b5aff 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory(applications) -#add_subdirectory(services) +add_subdirectory(services) add_subdirectory(setup) add_subdirectory(shell) add_subdirectory(system) diff --git a/base/services/CMakeLists.txt b/base/services/CMakeLists.txt index 4f641f9cb73..0672ef851f8 100644 --- a/base/services/CMakeLists.txt +++ b/base/services/CMakeLists.txt @@ -1,11 +1,11 @@ -#add_subdirectory(audiosrv) -#add_subdirectory(eventlog) +add_subdirectory(audiosrv) +add_subdirectory(eventlog) #add_subdirectory(rpcss) -#add_subdirectory(spoolsv) -#add_subdirectory(svchost) -#add_subdirectory(tcpsvcs) -#add_subdirectory(telnetd) -#add_subdirectory(tftpd) -#add_subdirectory(umpnpmgr) -#add_subdirectory(wlansvc) +add_subdirectory(spoolsv) +add_subdirectory(svchost) +add_subdirectory(tcpsvcs) +add_subdirectory(telnetd) +add_subdirectory(tftpd) +add_subdirectory(umpnpmgr) +add_subdirectory(wlansvc) diff --git a/base/services/audiosrv/CMakeLists.txt b/base/services/audiosrv/CMakeLists.txt new file mode 100644 index 00000000000..a48aff2c889 --- /dev/null +++ b/base/services/audiosrv/CMakeLists.txt @@ -0,0 +1,15 @@ + +set_unicode(audiosrv yes) + +add_executable(audiosrv + main.c + pnp_list_manager.c + pnp_list_lock.c + pnp.c + services.c + debug.c + audiosrv.rc) + +set_module_type(audiosrv win32cui) +add_importlibs(audiosrv advapi32 user32 setupapi msvcrt) + diff --git a/base/services/eventlog/CMakeLists.txt b/base/services/eventlog/CMakeLists.txt new file mode 100644 index 00000000000..092589d553c --- /dev/null +++ b/base/services/eventlog/CMakeLists.txt @@ -0,0 +1,21 @@ + +include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) + +set_unicode() + +list(APPEND SOURCE + eventlog.c + logport.c + eventlog.rc + rpc.c + file.c) + +add_executable(eventlog ${CMAKE_CURRENT_BINARY_DIR}/eventlog_eventlog.h.gch ${SOURCE}) + +target_link_libraries(eventlog eventlogrpc_server pseh) + +add_pch(eventlog ${CMAKE_CURRENT_SOURCE_DIR}/eventlog.h ${SOURCE}) + +set_module_type(eventlog win32cui) + +add_importlibs(eventlog advapi32 rpcrt4 msvcrt) diff --git a/base/services/rpcss/CMakeLists.txt b/base/services/rpcss/CMakeLists.txt new file mode 100644 index 00000000000..a7f96c016c5 --- /dev/null +++ b/base/services/rpcss/CMakeLists.txt @@ -0,0 +1,19 @@ + +set_unicode() + +add_executable(rpcss + epmp.c + irotp.c + rpcss_main.c + service_main.c + epm.idl + irot.idl + rpcss.rc) + +target_link_libraries(rpcss rpcss_epm_server rpcss_irot_server pseh) + +add_pch(rpcss ${CMAKE_CURRENT_SOURCE_DIR}/rpcss.h ${SOURCE}) + +set_module_type(rpcss win32cui) + +add_importlibs(rpcss advapi32 rpcrt4 msvcrt) diff --git a/base/services/spoolsv/CMakeLists.txt b/base/services/spoolsv/CMakeLists.txt new file mode 100644 index 00000000000..30faf3d98fa --- /dev/null +++ b/base/services/spoolsv/CMakeLists.txt @@ -0,0 +1,9 @@ + +set_unicode() + +add_executable(spoolsv spoolsv.c spoolsv.rc) + +target_link_libraries(spoolsv wine) + +set_module_type(spoolsv win32cui) +add_importlibs(spoolsv advapi32 msvcrt) diff --git a/base/services/svchost/CMakeLists.txt b/base/services/svchost/CMakeLists.txt new file mode 100644 index 00000000000..9d2875aeec7 --- /dev/null +++ b/base/services/svchost/CMakeLists.txt @@ -0,0 +1,5 @@ + +add_executable(svchost svchost.c svchost.rc) + +set_module_type(svchost win32cui) +add_importlibs(svchost advapi32 msvcrt) diff --git a/base/services/tcpsvcs/CMakeLists.txt b/base/services/tcpsvcs/CMakeLists.txt new file mode 100644 index 00000000000..e5717b2caad --- /dev/null +++ b/base/services/tcpsvcs/CMakeLists.txt @@ -0,0 +1,20 @@ + +set_unicode() + +list(APPEND SOURCE + tcpsvcs.c + skelserver.c + echo.c + discard.c + daytime.c + qotd.c + chargen.c + tcpsvcs.rc + log.c) + +add_executable(tcpsvcs ${CMAKE_CURRENT_BINARY_DIR}/tcpsvcs_tcpsvcs.h.gch ${SOURCE}) + +add_pch(tcpsvcs ${CMAKE_CURRENT_SOURCE_DIR}/tcpsvcs.h ${SOURCE}) +set_module_type(tcpsvcs win32cui) +add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt) + diff --git a/base/services/telnetd/CMakeLists.txt b/base/services/telnetd/CMakeLists.txt new file mode 100644 index 00000000000..c29a3ad824f --- /dev/null +++ b/base/services/telnetd/CMakeLists.txt @@ -0,0 +1,11 @@ + +add_executable(telnetd + telnetd.c + serviceentry.c + telnetd.rc) + +target_link_libraries(telnetd wine) + +set_module_type(telnetd win32cui) +add_importlibs(telnetd advapi32 ws2_32 msvcrt) + diff --git a/base/services/tftpd/CMakeLists.txt b/base/services/tftpd/CMakeLists.txt new file mode 100644 index 00000000000..3ed1214854a --- /dev/null +++ b/base/services/tftpd/CMakeLists.txt @@ -0,0 +1,7 @@ + +add_executable(tftpd tftpd.cpp) + +target_link_libraries(tftpd wine) + +set_module_type(tftpd win32cui) +add_importlibs(tftpd advapi32 ws2_32 msvcrt) diff --git a/base/services/umpnpmgr/CMakeLists.txt b/base/services/umpnpmgr/CMakeLists.txt new file mode 100644 index 00000000000..01341d2d000 --- /dev/null +++ b/base/services/umpnpmgr/CMakeLists.txt @@ -0,0 +1,16 @@ + +set_unicode() +include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +add_executable(umpnpmgr umpnpmgr.c umpnpmgr.rc) + +target_link_libraries(umpnpmgr pnp_server wdmguid pseh) + +set_module_type(umpnpmgr win32cui) +add_importlibs(umpnpmgr + advapi32 + rpcrt4 + userenv + msvcrt) diff --git a/base/services/wlansvc/CMakeLists.txt b/base/services/wlansvc/CMakeLists.txt new file mode 100644 index 00000000000..d692fb85c6b --- /dev/null +++ b/base/services/wlansvc/CMakeLists.txt @@ -0,0 +1,14 @@ + +set_unicode() +include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) + +add_executable(wlansvc wlansvc.c rpcserver.c) + +target_link_libraries(wlansvc wlansvc_server pseh) + +set_module_type(wlansvc win32cui) +add_importlibs(wlansvc + advapi32 + rpcrt4 + iphlpapi + msvcrt) diff --git a/base/setup/CMakeLists.txt b/base/setup/CMakeLists.txt index 9f10fdf6441..02a7bc1c2e9 100644 --- a/base/setup/CMakeLists.txt +++ b/base/setup/CMakeLists.txt @@ -1,6 +1,6 @@ -#add_subdirectory(reactos) -#add_subdirectory(setup) +add_subdirectory(reactos) +add_subdirectory(setup) add_subdirectory(usetup) -#add_subdirectory(vmwinst) -#add_subdirectory(welcome) +add_subdirectory(vmwinst) +add_subdirectory(welcome) diff --git a/base/setup/reactos/CMakeLists.txt b/base/setup/reactos/CMakeLists.txt new file mode 100644 index 00000000000..ed1bfa8ee91 --- /dev/null +++ b/base/setup/reactos/CMakeLists.txt @@ -0,0 +1,16 @@ + +set_unicode() + +add_executable(reactos + reactos.c + reactos.rc) + +target_link_libraries(reactos uuid) + +set_module_type(reactos win32gui) +add_importlibs(reactos + gdi32 + user32 + comctl32 + setupapi + msvcrt) diff --git a/base/setup/setup/CMakeLists.txt b/base/setup/setup/CMakeLists.txt new file mode 100644 index 00000000000..edf073e44e1 --- /dev/null +++ b/base/setup/setup/CMakeLists.txt @@ -0,0 +1,9 @@ + +set_unicode() + +add_executable(setup + setup.c + setup.rc) + +set_module_type(setup win32gui) +add_importlibs(setup userenv msvcrt) diff --git a/base/setup/vmwinst/CMakeLists.txt b/base/setup/vmwinst/CMakeLists.txt new file mode 100644 index 00000000000..3c6033b4cb2 --- /dev/null +++ b/base/setup/vmwinst/CMakeLists.txt @@ -0,0 +1,19 @@ + +set_unicode() + +add_executable(vmwinst + vmwinst.c + vmwinst.rc) + +target_link_libraries(vmwinst pseh) + +set_module_type(vmwinst win32gui) +add_importlibs(vmwinst + advapi32 + comctl32 + comdlg32 + newdev + user32 + setupapi + shell32 + msvcrt) diff --git a/base/setup/welcome/CMakeLists.txt b/base/setup/welcome/CMakeLists.txt new file mode 100644 index 00000000000..40f43e94e96 --- /dev/null +++ b/base/setup/welcome/CMakeLists.txt @@ -0,0 +1,9 @@ + +set_unicode() + +add_executable(welcome + welcome.c + welcome.rc) + +set_module_type(welcome win32gui) +add_importlibs(welcome gdi32 user32 msvcrt) diff --git a/base/shell/CMakeLists.txt b/base/shell/CMakeLists.txt index bd375ff1c43..dc06a56fcda 100644 --- a/base/shell/CMakeLists.txt +++ b/base/shell/CMakeLists.txt @@ -1,4 +1,4 @@ add_subdirectory(cmd) add_subdirectory(explorer) -#add_subdirectory(explorer_new) +add_subdirectory(explorer-new) diff --git a/base/shell/explorer-new/CMakeLists.txt b/base/shell/explorer-new/CMakeLists.txt new file mode 100644 index 00000000000..601bc5f874c --- /dev/null +++ b/base/shell/explorer-new/CMakeLists.txt @@ -0,0 +1,34 @@ + +set_unicode() + +add_definitions(-DWIN32) + +list(APPEND SOURCE + desktop.c + dragdrop.c + explorer.c + startmnu.c + taskband.c + taskswnd.c + tbsite.c + trayntfy.c + trayprop.c + traywnd.c + explorer.rc) + +add_executable(explorer_new ${CMAKE_CURRENT_BINARY_DIR}/explorer_new_precomp.h.gch ${SOURCE}) + +target_link_libraries(explorer_new uuid) + +add_pch(explorer_new ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE) +set_module_type(explorer_new win32gui) +add_importlibs(explorer_new + advapi32 + gdi32 + user32 + comctl32 + ole32 + oleaut32 + shell32 + shlwapi + msvcrt) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index da4289b7be1..ff0ba52a84e 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -192,11 +192,11 @@ add_subdirectory(updspapi) add_subdirectory(url) #add_subdirectory(urlmon) add_subdirectory(user32) -#add_subdirectory(userenv) +add_subdirectory(userenv) add_subdirectory(usp10) add_subdirectory(uxtheme) -#add_subdirectory(vdmdbg) -#add_subdirectory(version) +add_subdirectory(vdmdbg) +add_subdirectory(version) add_subdirectory(wdmaud.drv) add_subdirectory(windowscodecs) #add_subdirectory(winemp3.acm) diff --git a/dll/win32/userenv/CMakeLists.txt b/dll/win32/userenv/CMakeLists.txt new file mode 100644 index 00000000000..538788c5897 --- /dev/null +++ b/dll/win32/userenv/CMakeLists.txt @@ -0,0 +1,28 @@ + +spec2def(userenv ${CMAKE_CURRENT_SOURCE_DIR}/userenv.spec ${CMAKE_CURRENT_BINARY_DIR}/userenv.def) + +list(APPEND SOURCE + desktop.c + directory.c + environment.c + gpolicy.c + misc.c + profile.c + registry.c + setup.c + userenv.c + userenv.rc) + +add_library(userenv SHARED + ${CMAKE_CURRENT_BINARY_DIR}/userenv_precomp.h.gch + ${SOURCE}) + +set_module_type(userenv win32dll) + +target_link_libraries(userenv + ${CMAKE_CURRENT_BINARY_DIR}/userenv.def + uuid) + +add_importlibs(userenv advapi32 user32 kernel32 ntdll) +add_pch(userenv ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(userenv userenv_def) diff --git a/dll/win32/vdmdbg/CMakeLists.txt b/dll/win32/vdmdbg/CMakeLists.txt new file mode 100644 index 00000000000..98e1d29e6c7 --- /dev/null +++ b/dll/win32/vdmdbg/CMakeLists.txt @@ -0,0 +1,18 @@ + +set_unicode() + +spec2def(vdmdbg ${CMAKE_CURRENT_SOURCE_DIR}/vdmdbg.spec ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg.def) + +list(APPEND SOURCE vdmdbg.c) + +add_library(vdmdbg SHARED + ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg_vdmdbg.h.gch + ${SOURCE}) + +set_module_type(vdmdbg win32dll) + +target_link_libraries(vdmdbg ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg.def) + +add_importlibs(vdmdbg kernel32 ntdll) +add_pch(vdmdbg ${CMAKE_CURRENT_SOURCE_DIR}/vdmdbg.h ${SOURCE}) +add_dependencies(vdmdbg vdmdbg_def) diff --git a/dll/win32/version/CMakeLists.txt b/dll/win32/version/CMakeLists.txt new file mode 100644 index 00000000000..2b7f639002a --- /dev/null +++ b/dll/win32/version/CMakeLists.txt @@ -0,0 +1,20 @@ + +add_definitions(-D__WINESRC__) +spec2def(version ${CMAKE_CURRENT_SOURCE_DIR}/version.spec ${CMAKE_CURRENT_BINARY_DIR}/version.def) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(version SHARED + info.c + install.c + resource.c + version.rc) + +set_entrypoint(version 0) + +target_link_libraries(version + ${CMAKE_CURRENT_BINARY_DIR}/version.def + wine) + +add_importlibs(version lz32 kernel32 ntdll) +add_dependencies(version version_def psdk buildno_header) diff --git a/dll/win32/wdmaud.drv/CMakeLists.txt b/dll/win32/wdmaud.drv/CMakeLists.txt index fb3d962bde2..c2aa0f96c1d 100644 --- a/dll/win32/wdmaud.drv/CMakeLists.txt +++ b/dll/win32/wdmaud.drv/CMakeLists.txt @@ -33,4 +33,4 @@ target_link_libraries(wdmaud.drv mmixer) add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll) -add_dependencies(wdmaud.drv wdmaud.drv_def psdk) +add_dependencies(wdmaud.drv wdmaud.drv_def) diff --git a/dll/win32/wuapi/CMakeLists.txt b/dll/win32/wuapi/CMakeLists.txt index b5da9339fd1..144799bd4f2 100644 --- a/dll/win32/wuapi/CMakeLists.txt +++ b/dll/win32/wuapi/CMakeLists.txt @@ -24,4 +24,4 @@ target_link_libraries(wuapi wine) add_importlibs(wuapi uuid ole32 advapi32 kernel32 ntdll) -add_dependencies(wuapi wuapi_def psdk buildno_header) +add_dependencies(wuapi wuapi_def)