Author: akhaldi Date: Thu Nov 4 21:06:20 2010 New Revision: 49469
URL: http://svn.reactos.org/svn/reactos?rev=49469&view=rev Log: [CMAKE] - Improve more drivers.
Modified: branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/fastfat_new/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/fs_rec/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/msfs/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/npfs/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt branches/cmake-bringup/drivers/network/afd/CMakeLists.txt branches/cmake-bringup/drivers/network/dd/ne2000/CMakeLists.txt branches/cmake-bringup/drivers/network/dd/pcnet/CMakeLists.txt branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt branches/cmake-bringup/drivers/parallel/parallel/CMakeLists.txt branches/cmake-bringup/drivers/serial/serenum/CMakeLists.txt branches/cmake-bringup/drivers/serial/serial/CMakeLists.txt branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt
Modified: branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pci/CM... ============================================================================== --- branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -5,9 +5,8 @@ pdo.c pci.rc)
-set_target_properties(pci PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") +set_module_type(pci kernelmodedriver) +add_importlibs(pci ntoskrnl hal)
-add_importlibs(pci ntoskrnl hal) -add_dependencies(pci psdk bugcodes buildno_header) add_minicd_target(pci reactos pci.sys) -add_livecd_target(pci reactos/system32/drivers) +add_livecd_target(pci reactos/system32/drivers)
Modified: branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcix/C... ============================================================================== --- branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -38,9 +38,8 @@
add_library(pcix SHARED ${CMAKE_CURRENT_BINARY_DIR}/pcix_pci.h.gch ${SOURCE})
-set_target_properties(pcix PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") - +set_module_type(pcix kernelmodedriver) add_importlibs(pcix ntoskrnl hal)
add_pch(pcix ${CMAKE_CURRENT_SOURCE_DIR}/pci.h ${SOURCE}) -add_dependencies(pcix psdk pciclass buildno_header) +add_dependencies(pcix pciclass)
Modified: branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcmcia... ============================================================================== --- branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -5,9 +5,8 @@ pdo.c pcmcia.rc)
-set_target_properties(pcmcia PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") +set_module_type(pcmcia kernelmodedriver) +add_importlibs(pcmcia ntoskrnl hal)
-add_importlibs(pcmcia ntoskrnl hal) -add_dependencies(pcmcia psdk bugcodes buildno_header) add_minicd_target(pcmcia reactos pcmcia.sys) -add_livecd_target(pcmcia reactos/system32/drivers) +add_livecd_target(pcmcia reactos/system32/drivers)
Modified: branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/dx... ============================================================================== --- branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -3,10 +3,10 @@
spec2def(dxapi.sys dxapi.spec)
-add_library(dxapi SHARED main.c dxapi.rc +add_library(dxapi SHARED + main.c + dxapi.rc ${CMAKE_CURRENT_BINARY_DIR}/dxapi.def)
-set_target_properties(dxapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") - +set_module_type(dxapi kernelmodedriver) add_importlibs(dxapi ntoskrnl hal videoprt) -add_dependencies(dxapi psdk bugcodes)
Modified: branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/dx... ============================================================================== --- branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -9,8 +9,5 @@ dxg.rc ${CMAKE_CURRENT_BINARY_DIR}/dxg.def)
-set_target_properties(dxg PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") - - +set_module_type(dxg kernelmodedriver) add_importlibs(dxg dxgthk ntoskrnl) -add_dependencies(dxg psdk bugcodes)
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] Thu Nov 4 21:06:20 2010 @@ -1,10 +1,10 @@
spec2def(dxgthk.sys dxgthk.spec)
-add_library(dxgthk SHARED main.c dxgthk.rc +add_library(dxgthk SHARED + main.c + dxgthk.rc ${CMAKE_CURRENT_BINARY_DIR}/dxgthk.def)
-set_target_properties(dxgthk PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") - +set_module_type(dxgthk kernelmodedriver) add_importlibs(dxgthk win32k) -add_dependencies(dxgthk psdk bugcodes)
Modified: branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesystem... ============================================================================== --- branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,5 +1,3 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers)
@@ -21,13 +19,10 @@
add_library(cdfs SHARED ${CMAKE_CURRENT_BINARY_DIR}/cdfs_cdfs.h.gch ${SOURCE})
-set_target_properties(cdfs PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") - -target_link_libraries(cdfs - -lntoskrnl - -lhal) +set_module_type(cdfs kernelmodedriver) +add_importlibs(cdfs ntoskrnl hal)
add_pch(cdfs ${CMAKE_CURRENT_SOURCE_DIR}/cdfs.h ${SOURCE}) -add_dependencies(cdfs psdk bugcodes) + add_minicd_target(cdfs reactos cdfs.sys) -add_livecd_target(cdfs reactos/system32/drivers cdfs.sys) +add_livecd_target(cdfs reactos/system32/drivers cdfs.sys)
Modified: branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesystem... ============================================================================== --- branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,3 +1,4 @@ + include_directories(inc)
list(APPEND SOURCE @@ -22,13 +23,8 @@
add_library(ext2fs SHARED ${SOURCE})
-set_target_properties(ext2fs PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(ext2fs kernelmodedriver) +add_importlibs(ext2fs ntoskrnl hal)
- -target_link_libraries(ext2fs - -lntoskrnl - -lhal) - -add_dependencies(ext2fs psdk bugcodes) add_minicd_target(ext2fs reactos ext2.sys) -add_livecd_target(ext2fs reactos/system32/drivers ext2.sys) +add_livecd_target(ext2fs reactos/system32/drivers ext2.sys)
Modified: branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesystem... ============================================================================== --- branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,5 +1,3 @@ - -
list(APPEND SOURCE blockdev.c @@ -27,13 +25,10 @@
add_library(fastfat SHARED ${CMAKE_CURRENT_BINARY_DIR}/fastfat_vfat.h.gch ${SOURCE})
-set_target_properties(fastfat PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") - -target_link_libraries(fastfat - -lntoskrnl - -lhal) +set_module_type(fastfat kernelmodedriver) +add_importlibs(fastfat ntoskrnl hal)
add_pch(fastfat ${CMAKE_CURRENT_SOURCE_DIR}/vfat.h ${SOURCE}) -add_dependencies(fastfat psdk bugcodes) + add_minicd_target(fastfat reactos fastfat.sys) -add_livecd_target(fastfat reactos/system32/drivers) +add_livecd_target(fastfat reactos/system32/drivers)
Modified: branches/cmake-bringup/drivers/filesystems/fastfat_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesystem... ============================================================================== --- branches/cmake-bringup/drivers/filesystems/fastfat_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/fastfat_new/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,6 +1,7 @@
-include_directories(.) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fullfat) +include_directories( + . + ${REACTOS_SOURCE_DIR}/include/reactos/libs/fullfat)
list(APPEND SOURCE cleanup.c @@ -25,7 +26,7 @@
add_library(fastfat_new SHARED ${CMAKE_CURRENT_BINARY_DIR}/fastfat_new_fastfat.h.gch ${SOURCE})
-set_target_properties(fastfat_new PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(fastfat_new kernelmodedriver)
target_link_libraries(fastfat_new ${PSEH_LIB} @@ -34,4 +35,3 @@ add_importlibs(fastfat_new ntoskrnl hal)
add_pch(fastfat_new ${CMAKE_CURRENT_SOURCE_DIR}/fastfat.h ${SOURCE}) -add_dependencies(fastfat_new psdk bugcodes)
Modified: branches/cmake-bringup/drivers/filesystems/fs_rec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesystem... ============================================================================== --- branches/cmake-bringup/drivers/filesystems/fs_rec/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/fs_rec/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -9,8 +9,7 @@ udfs.c fs_rec.rc)
-set_target_properties(fs_rec PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(fs_rec kernelmodedriver) +add_importlibs(fs_rec ntoskrnl hal)
-add_importlibs(fs_rec ntoskrnl hal) -add_dependencies(fs_rec psdk bugcodes) -add_cab_target(fs_rec 2) +add_cab_target(fs_rec 2)
Modified: branches/cmake-bringup/drivers/filesystems/msfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesystem... ============================================================================== --- branches/cmake-bringup/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -9,9 +9,9 @@
add_library(msfs SHARED ${CMAKE_CURRENT_BINARY_DIR}/msfs_msfs.h.gch ${SOURCE})
-set_target_properties(msfs PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(msfs kernelmodedriver) +add_importlibs(msfs ntoskrnl hal)
-add_importlibs(msfs ntoskrnl hal) add_pch(msfs ${CMAKE_CURRENT_SOURCE_DIR}/msfs.h ${SOURCE}) -add_dependencies(msfs psdk bugcodes) -add_cab_target(msfs 2) + +add_cab_target(msfs 2)
Modified: branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesystem... ============================================================================== --- branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -4,7 +4,5 @@ mup.c mup.rc)
-set_target_properties(mup PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") - +set_module_type(mup kernelmodedriver) add_importlibs(mup ntoskrnl hal) -add_dependencies(mup psdk bugcodes)
Modified: branches/cmake-bringup/drivers/filesystems/npfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesystem... ============================================================================== --- branches/cmake-bringup/drivers/filesystems/npfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/npfs/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -10,10 +10,9 @@
add_library(npfs SHARED ${CMAKE_CURRENT_BINARY_DIR}/npfs_npfs.h.gch ${SOURCE})
-set_target_properties(npfs PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") - +set_module_type(npfs kernelmodedriver) add_importlibs(npfs ntoskrnl hal)
add_pch(npfs ${CMAKE_CURRENT_SOURCE_DIR}/npfs.h ${SOURCE}) -add_dependencies(npfs psdk bugcodes) -add_cab_target(npfs 2) + +add_cab_target(npfs 2)
Modified: branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesystem... ============================================================================== --- branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -19,8 +19,7 @@
add_library(ntfs SHARED ${CMAKE_CURRENT_BINARY_DIR}/ntfs_ntfs.h.gch ${SOURCE})
-set_target_properties(ntfs PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(ntfs kernelmodedriver) +add_importlibs(ntfs ntoskrnl hal)
-add_importlibs(ntfs ntoskrnl hal) add_pch(ntfs ${CMAKE_CURRENT_SOURCE_DIR}/ntfs.h ${SOURCE}) -add_dependencies(ntfs psdk bugcodes)
Modified: branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/i804... ============================================================================== --- branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,5 +1,3 @@ - -
add_library(i8042prt SHARED createclose.c @@ -15,7 +13,6 @@ i8042prt.rc)
set_module_type(i8042prt kernelmodedriver) - add_importlibs(i8042prt ntoskrnl hal)
add_minicd_target(i8042prt reactos i8042prt.sys)
Modified: branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/kbdc... ============================================================================== --- branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,5 +1,3 @@ - -
add_library(kbdclass SHARED kbdclass.c
Modified: branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/mouc... ============================================================================== --- branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,5 +1,3 @@ - -
add_library(mouclass SHARED misc.c
Modified: branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/serm... ============================================================================== --- branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,5 +1,3 @@ - -
add_library(sermouse SHARED createclose.c @@ -11,12 +9,7 @@ sermouse.c sermouse.rc)
-set_target_properties(sermouse PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") - -target_link_libraries(sermouse - -lntoskrnl - -lhal) - -add_dependencies(sermouse psdk bugcodes) +set_module_type(sermouse kernelmodedriver) +add_importlibs(sermouse ntoskrnl hal)
add_cab_target(sermouse 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] Thu Nov 4 21:06:20 2010 @@ -1,6 +1,7 @@
-add_definitions(-DBUILDING_KS) -add_definitions(-D_COMDDK_) +add_definitions( + -DBUILDING_KS + -D_COMDDK_)
add_library(ks SHARED api.c
Modified: branches/cmake-bringup/drivers/network/afd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/af... ============================================================================== --- branches/cmake-bringup/drivers/network/afd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/afd/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,6 +1,7 @@
-include_directories(BEFORE include) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) +include_directories( + BEFORE include + ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
list(APPEND SOURCE afd/bind.c @@ -18,15 +19,11 @@ afd.rc)
add_library(afd SHARED ${CMAKE_CURRENT_BINARY_DIR}/afd_afd.h.gch ${SOURCE}) +target_link_libraries(afd ${PSEH_LIB})
set_module_type(afd kernelmodedriver) - -target_link_libraries(afd - ${PSEH_LIB} - -lntoskrnl - -lhal) +add_importlibs(afd ntoskrnl hal)
add_pch(afd ${CMAKE_CURRENT_SOURCE_DIR}/include/afd.h ${SOURCE}) -add_dependencies(afd psdk bugcodes buildno_header)
-add_cab_target(afd 2) +add_cab_target(afd 2)
Modified: branches/cmake-bringup/drivers/network/dd/ne2000/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/dd... ============================================================================== --- branches/cmake-bringup/drivers/network/dd/ne2000/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/dd/ne2000/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -9,12 +9,6 @@ add_library(ne2000 SHARED ${SOURCE})
set_module_type(ne2000 kernelmodedriver) +add_importlibs(ne2000 ndis ntoskrnl hal)
-target_link_libraries(ne2000 - -lndis - -lntoskrnl - -lhal) - -add_dependencies(ne2000 psdk bugcodes buildno_header) - -add_cab_target(ne2000 2) +add_cab_target(ne2000 2)
Modified: branches/cmake-bringup/drivers/network/dd/pcnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/dd... ============================================================================== --- branches/cmake-bringup/drivers/network/dd/pcnet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/dd/pcnet/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,8 +1,9 @@
-add_definitions(-DNDIS50_MINIPORT) -add_definitions(-DNDIS_MINIPORT_DRIVER) -add_definitions(-DNDIS_LEGACY_MINIPORT) -add_definitions(-DNDIS51_MINIPORT) +add_definitions( + -DNDIS50_MINIPORT + -DNDIS_MINIPORT_DRIVER + -DNDIS_LEGACY_MINIPORT + -DNDIS51_MINIPORT)
list(APPEND SOURCE pcnet.c @@ -12,12 +13,6 @@ add_library(pcnet SHARED ${SOURCE})
set_module_type(pcnet kernelmodedriver) +add_importlibs(pcnet ndis ntoskrnl hal)
-target_link_libraries(pcnet - -lndis - -lntoskrnl - -lhal) - -add_dependencies(pcnet psdk bugcodes buildno_header) - -add_cab_target(pcnet 2) +add_cab_target(pcnet 2)
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] Thu Nov 4 21:06:20 2010 @@ -1,13 +1,14 @@
include_directories(BEFORE include)
-add_definitions(-DNDIS_WRAPPER) -add_definitions(-DNDIS51) -add_definitions(-DNDIS51_MINIPORT) -add_definitions(-DNDIS_LEGACY_DRIVER) -add_definitions(-DNDIS_LEGACY_MINIPORT) -add_definitions(-DNDIS_LEGACY_PROTOCOL) -add_definitions(-DNDIS_MINIPORT_DRIVER) +add_definitions( + -DNDIS_WRAPPER + -DNDIS51 + -DNDIS51_MINIPORT + -DNDIS_LEGACY_DRIVER + -DNDIS_LEGACY_MINIPORT + -DNDIS_LEGACY_PROTOCOL + -DNDIS_MINIPORT_DRIVER)
spec2def(ndis.sys ndis.spec)
@@ -36,12 +37,9 @@
add_library(ndis SHARED ${CMAKE_CURRENT_BINARY_DIR}/ndis_ndissys.h.gch ${SOURCE})
-set_target_properties(ndis PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") - -target_link_libraries(ndis - -lntoskrnl - -lhal) +set_module_type(ndis kernelmodedriver) +add_importlibs(ndis ntoskrnl hal)
add_pch(ndis ${CMAKE_CURRENT_SOURCE_DIR}/include/ndissys.h ${SOURCE}) -add_dependencies(ndis psdk bugcodes buildno_header) -add_cab_target(ndis 2) + +add_cab_target(ndis 2)
Modified: branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/tc... ============================================================================== --- branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,9 +1,11 @@
-include_directories(BEFORE include) -include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include) +include_directories( + BEFORE include + ${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include)
-add_definitions(-DNDIS40) -add_definitions(-D_NTDRIVER_) +add_definitions( + -DNDIS40 + -D_NTDRIVER_)
spec2def(tcpip.sys tcpip.spec)
@@ -26,18 +28,15 @@
add_library(tcpip SHARED ${CMAKE_CURRENT_BINARY_DIR}/tcpip_precomp.h.gch ${SOURCE})
-set_module_type(tcpip kernelmodedriver) - target_link_libraries(tcpip ip oskittcp ${PSEH_LIB} - chew - -lndis - -lntoskrnl - -lhal) + chew) + +set_module_type(tcpip kernelmodedriver) +add_importlibs(tcpip ndis ntoskrnl hal)
add_pch(tcpip ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE}) -add_dependencies(tcpip psdk bugcodes buildno_header)
-add_cab_target(tcpip 2) +add_cab_target(tcpip 2)
Modified: branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/td... ============================================================================== --- branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,9 +1,11 @@
-include_directories(BEFORE include) -include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include) +include_directories( + BEFORE include + ${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include)
-add_definitions(-DNDIS40) -add_definitions(-D_NTDRIVER_) +add_definitions( + -DNDIS40 + -D_NTDRIVER_)
spec2def(tdi.sys misc/tdi.spec)
@@ -21,11 +23,6 @@ add_library(tdi SHARED ${SOURCE})
set_module_type(tdi kernelmodedriver) +add_importlibs(tdi ntoskrnl hal)
-target_link_libraries(tdi - -lntoskrnl - -lhal) - -add_dependencies(tdi psdk bugcodes buildno_header) - -add_cab_target(tdi 2) +add_cab_target(tdi 2)
Modified: branches/cmake-bringup/drivers/parallel/parallel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/parallel/p... ============================================================================== --- branches/cmake-bringup/drivers/parallel/parallel/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/parallel/parallel/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,7 +1,5 @@
add_library(parallel SHARED parallel.c parallel.rc)
-set_target_properties(parallel PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") - +set_module_type(parallel kernelmodedriver) add_importlibs(parallel ntoskrnl hal) -add_dependencies(parallel psdk bugcodes)
Modified: branches/cmake-bringup/drivers/serial/serenum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/serial/ser... ============================================================================== --- branches/cmake-bringup/drivers/serial/serenum/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/serial/serenum/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -7,8 +7,7 @@ serenum.c serenum.rc)
-set_target_properties(serenum PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(serenum kernelmodedriver) +add_importlibs(serenum ntoskrnl hal)
-add_importlibs(serenum ntoskrnl hal) -add_dependencies(serenum psdk bugcodes) -add_cab_target(serenum 2) +add_cab_target(serenum 2)
Modified: branches/cmake-bringup/drivers/serial/serial/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/serial/ser... ============================================================================== --- branches/cmake-bringup/drivers/serial/serial/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/serial/serial/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -14,8 +14,7 @@ serial.c serial.rc)
-set_target_properties(serial PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(serial kernelmodedriver) +add_importlibs(serial ntoskrnl hal)
-add_importlibs(serial ntoskrnl hal) -add_dependencies(serial psdk bugcodes) -add_cab_target(serial 2) +add_cab_target(serial 2)
Modified: branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/setup/blue... ============================================================================== --- branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,16 +1,10 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers)
add_library(blue SHARED blue.c font.c blue.rc)
-set_target_properties(blue PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(blue kernelmodedriver) +add_importlibs(blue ntoskrnl hal)
-target_link_libraries(blue - -lntoskrnl - -lhal) - -add_dependencies(blue psdk bugcodes) add_minicd_target(blue reactos blue.sys) -add_cab_target(blue 2) +add_cab_target(blue 2)
Modified: branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/id... ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -15,7 +15,6 @@ ros_glue/ros_glue.cpp)
set_module_type(uniata kernelmodedriver) - add_importlibs(uniata scsiport ntoskrnl hal)
add_minicd_target(uniata reactos uniata.sys)
-
akhaldi＠svn.reactos.org