Author: akhaldi Date: Fri Dec 3 17:41:29 2010 New Revision: 49932
URL: http://svn.reactos.org/svn/reactos?rev=49932&view=rev Log: [CMAKE] - Improve more modules.
Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt branches/cmake-bringup/drivers/wmi/CMakeLists.txt branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt
Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLis... ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -102,8 +102,8 @@ add_subdirectory(mssip32) #add_subdirectory(mstask) add_subdirectory(msvcrt) -add_subdirectory(msvcrt20) -add_subdirectory(msvcrt40) +#add_subdirectory(msvcrt20) FIX spec2def +#add_subdirectory(msvcrt40) FIX spec2def add_subdirectory(msvfw32) add_subdirectory(msvidc32) add_subdirectory(mswsock) @@ -212,7 +212,7 @@ add_subdirectory(wlanapi) add_subdirectory(wldap32) add_subdirectory(wmi) -add_subdirectory(ws2_32) +#add_subdirectory(ws2_32) SPEC add_subdirectory(ws2_32_new) add_subdirectory(ws2help) add_subdirectory(wshirda)
Modified: branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/battery/ba... ============================================================================== --- branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -12,4 +12,4 @@ add_importlibs(battc ntoskrnl hal)
add_cab_target(battc 2) -add_importlib_target(battc.spec) +add_importlib_target(battc.spec batc.sys)
Modified: branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/dx... ============================================================================== --- branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -11,6 +11,6 @@ set_module_type(dxgthk kernelmodedriver)
add_importlibs(dxgthk win32k) -add_importlib_target(dxgthk.spec) +add_importlib_target(dxgthk.spec dxgthk.sys)
add_cab_target(dxgthk 2)
Modified: branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/k... ============================================================================== --- branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -5,7 +5,7 @@ -DBUILDING_KS -D_COMDDK_)
-add_library(ks SHARED +list(APPEND SOURCE api.c allocators.c bag.c @@ -30,16 +30,18 @@ ks.rc ${CMAKE_CURRENT_BINARY_DIR}/ks.def)
+add_library(ks SHARED ${SOURCE}) + set_target_properties(ks PROPERTIES SUFFIX ".sys") + set_entrypoint(ks 0) set_subsystem(ks native) set_image_base(ks 0x00010000)
-target_link_libraries(ks - ${PSEH_LIB}) +target_link_libraries(ks ${PSEH_LIB})
add_importlibs(ks ntoskrnl hal msvcrt) add_dependencies(ks psdk bugcodes)
add_cab_target(ks 2) -add_importlib_target(ks.spec) +add_importlib_target(ks.spec ks.sys)
Modified: branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/nd... ============================================================================== --- branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -43,4 +43,4 @@ add_pch(ndis ${CMAKE_CURRENT_SOURCE_DIR}/include/ndissys.h ${SOURCE})
add_cab_target(ndis 2) -add_importlib_target(ndis.spec) +add_importlib_target(ndis.spec ndis.sys)
Modified: branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/cl... ============================================================================== --- branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -3,14 +3,17 @@
spec2def(class2.sys class2.spec)
-add_library(class2 SHARED +list(APPEND SOURCE class2.c class2.rc ${CMAKE_CURRENT_BINARY_DIR}/class2.def)
+add_library(class2 SHARED ${SOURCE}) + set_module_type(class2 kernelmodedriver) + add_importlibs(class2 scsiport ntoskrnl hal) +add_importlib_target(class2.spec class2.sys)
add_minicd_target(class2 reactos class2.sys) add_livecd_target(class2 reactos/system32/drivers) -add_importlib_target(class2.spec)
Modified: branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/id... ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -1,7 +1,7 @@
spec2def(pciidex.sys pciidex.spec)
-add_library(pciidex SHARED +list(APPEND SOURCE fdo.c miniport.c misc.c @@ -10,8 +10,10 @@ pciidex.rc ${CMAKE_CURRENT_BINARY_DIR}/pciidex.def)
+add_library(pciidex SHARED ${SOURCE}) + set_module_type(pciidex kernelmodedriver) add_importlibs(pciidex ntoskrnl)
add_cab_target(pciidex 2) -add_importlib_target(pciidex.spec) +add_importlib_target(pciidex.spec pciidex.sys)
Modified: branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/sc... ============================================================================== --- branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -1,17 +1,18 @@
spec2def(scsiport.sys scsiport.spec)
-add_library(scsiport SHARED - scsiport.c - stubs.c - scsiport.rc - ) - -target_link_libraries(scsiport ${CMAKE_CURRENT_SOURCE_DIR}/scsiport_i386.def) +list(APPEND SOURCE + scsiport.c + stubs.c + scsiport.rc + ${CMAKE_CURRENT_BINARY_DIR}/scsiport.def) + +add_library(scsiport SHARED ${SOURCE})
set_module_type(scsiport kernelmodedriver) + add_importlibs(scsiport ntoskrnl hal) +add_importlib_target(scsiport.spec scsiport.sys)
add_minicd_target(scsiport reactos scsiport.sys) add_livecd_target(scsiport reactos/system32/drivers) -add_importlib_target(scsiport.spec)
Modified: branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/vide... ============================================================================== --- branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -30,4 +30,4 @@
add_pch(videoprt ${CMAKE_CURRENT_SOURCE_DIR}/videoprt.h ${SOURCE}) add_cab_target(videoprt 2) -add_importlib_target(videoprt.spec) +add_importlib_target(videoprt.spec videoprt.sys)
Modified: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio/... ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -12,6 +12,6 @@
set_module_type(drmk kernelmodedriver) add_importlibs(drmk ntoskrnl) -add_importlib_target(drmk.spec) +add_importlib_target(drmk.spec drmk.sys)
add_cab_target(drmk 2)
Modified: branches/cmake-bringup/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wmi/CMakeL... ============================================================================== --- branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -11,6 +11,6 @@ set_module_type(wmilib kernelmodedriver)
add_importlibs(wmilib ntoskrnl) -add_importlib_target(wmilib.spec) +add_importlib_target(wmilib.spec wmilib.sys)
add_cab_target(wmilib 2)
Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/w... ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -192,5 +192,5 @@ add_pch(win32k ${CMAKE_CURRENT_SOURCE_DIR}/pch.h ${SOURCE}) add_dependencies(win32k gendib_generated subsystem_napi) add_cab_target(win32k 1) -add_importlib_target(win32k.spec) +add_importlib_target(win32k.spec win32k.sys)