[ros-diffs] [akhaldi] 49468: [CMAKE] - Improve base and bus drivers.

Author: akhaldi
Date: Thu Nov  4 20:46:27 2010
New Revision: 49468

URL: http://svn.reactos.org/svn/reactos?rev=49468&view=rev
Log:
[CMAKE]
- Improve base and bus drivers.

Modified:
    branches/cmake-bringup/drivers/base/beep/CMakeLists.txt
    branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt
    branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt
    branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt
    branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt
    branches/cmake-bringup/drivers/base/null/CMakeLists.txt
    branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt
    branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt
    branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt
    branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt
    branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt

Modified: branches/cmake-bringup/drivers/base/beep/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/beep…
==============================================================================
--- branches/cmake-bringup/drivers/base/beep/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/base/beep/CMakeLists.txt [iso-8859-1] Thu Nov  4
20:46:27 2010
@@ -1,13 +1,5 @@
-
-
 
 add_library(beep SHARED beep.c beep.rc)
-
-set_target_properties(beep PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8
-Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys")
-
-target_link_libraries(beep
-    -lntoskrnl
-    -lhal)
-
-add_dependencies(beep psdk bugcodes)
-add_cab_target(beep 2)
+set_module_type(beep kernelmodedriver)
+add_importlibs(beep ntoskrnl hal)
+add_cab_target(beep 2)

Modified: branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/boot…
==============================================================================
--- branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] Thu Nov  4
20:46:27 2010
@@ -18,12 +18,11 @@
 
 add_library(bootvid SHARED ${CMAKE_CURRENT_BINARY_DIR}/bootvid_precomp.h.gch ${SOURCE})
 
-set_target_properties(bootvid PROPERTIES LINK_FLAGS "-Wl,-entry,0
-Wl,--image-base,0x00010000")
+set_entrypoint(bootvid 0)
+set_subsystem(bootvid native)
+set_image_base(bootvid 0x00010000)
 
-target_link_libraries(bootvid
-    -lntoskrnl
-    -lhal)
-
+add_importlibs(bootvid ntoskrnl hal)
 add_pch(bootvid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(bootvid psdk buildno_header bugcodes)
 add_minicd_target(bootvid reactos bootvid.dll)

Modified: branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/kdco…
==============================================================================
--- branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] Thu Nov  4
20:46:27 2010
@@ -12,12 +12,12 @@
 
 add_library(kdcom SHARED ${SOURCE})
 
-set_target_properties(kdcom PROPERTIES LINK_FLAGS "-Wl,-entry,0
-Wl,--image-base,0x00010000")
+set_entrypoint(kdcom 0)
+set_subsystem(kdcom native)
+set_image_base(kdcom 0x00010000)
 
-target_link_libraries(kdcom
-    -lntoskrnl
-    -lhal)
+add_importlibs(kdcom ntoskrnl hal)
 
 add_dependencies(kdcom psdk buildno_header bugcodes)
 add_minicd_target(kdcom reactos kdcom.dll)
-add_livecd_target(kdcom reactos/system32)
+add_livecd_target(kdcom reactos/system32)

Modified: branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/kddl…
==============================================================================
--- branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt [iso-8859-1] Thu Nov  4
20:46:27 2010
@@ -7,10 +7,10 @@
     kdserial.c
     ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def)
 
-set_target_properties(kdcom PROPERTIES LINK_FLAGS "-Wl,-entry,0
-Wl,--image-base,0x00010000")
+set_entrypoint(kdcom 0)
+set_subsystem(kdcom native)
+set_image_base(kdcom 0x00010000)
 
-target_link_libraries(kdcom
-    -lntoskrnl
-    -lhal)
+add_importlibs(kdcom ntoskrnl hal)
 
 add_dependencies(kdcom psdk buildno_header bugcodes)

Modified: branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/nmid…
==============================================================================
--- branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt [iso-8859-1] Thu Nov  4
20:46:27 2010
@@ -1,14 +1,8 @@
-
-
 
 add_library(nmidebug SHARED nmidebug.c nmidebug.rc)
 
-set_target_properties(nmidebug PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8
-Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys")
+set_module_type(nmidebug kernelmodedriver)
+add_importlibs(nmidebug ntoskrnl hal)
 
-target_link_libraries(nmidebug
-    -lntoskrnl
-    -lhal)
-
-add_dependencies(nmidebug psdk bugcodes)
 add_minicd_target(nmidebug reactos)
 add_cab_target(nmidebug 2)

Modified: branches/cmake-bringup/drivers/base/null/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/null…
==============================================================================
--- branches/cmake-bringup/drivers/base/null/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/base/null/CMakeLists.txt [iso-8859-1] Thu Nov  4
20:46:27 2010
@@ -1,14 +1,9 @@
-
-
 
 add_library(null SHARED null.c null.rc)
 
-set_target_properties(null PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8
-Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys")
+target_link_libraries(null ${PSEH_LIB})
 
-target_link_libraries(null
-    ${PSEH_LIB}
-    -lntoskrnl
-    -lhal)
+set_module_type(null kernelmodedriver)
+add_importlibs(null ntoskrnl hal)
 
-add_dependencies(null psdk bugcodes)
-add_cab_target(null 2)
+add_cab_target(null 2)

Modified: branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/battery/b…
==============================================================================
--- branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] Thu Nov  4
20:46:27 2010
@@ -1,14 +1,7 @@
-
-
 
 add_definitions(-D_BATTERYCLASS_)
 
 add_library(battc SHARED battc.c battc.rc)
 
-set_target_properties(battc PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8
-Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX
".sys")
-
-target_link_libraries(battc
-    -lntoskrnl
-    -lhal)
-
-add_dependencies(battc psdk bugcodes)
+set_module_type(battc kernelmodedriver)
+add_importlibs(battc ntoskrnl hal)

Modified: branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/…
==============================================================================
--- branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Thu Nov  4
20:46:27 2010
@@ -1,6 +1,7 @@
 
-include_directories(include)
-include_directories(acpica/include)
+include_directories(
+    include
+    acpica/include)
 
 add_library(acpica
     acpica/dispatcher/dsfield.c
@@ -137,14 +138,13 @@
     buspdo.c
     main.c)
 
-set_target_properties(acpi PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8
-Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX
".sys")
+set_module_type(acpi kernelmodedriver)
 
 target_link_libraries(acpi
     wdmguid
     acpica)
 
 add_importlibs(acpi ntoskrnl hal)
-add_dependencies(acpi psdk bugcodes)
 
 add_minicd_target(acpi reactos acpi.sys)
 add_livecd_target(acpi reactos/system32/drivers)

Modified: branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/…
==============================================================================
--- branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt [iso-8859-1] Thu Nov  4
20:46:27 2010
@@ -8,9 +8,7 @@
 
 add_library(cmbatt SHARED ${CMAKE_CURRENT_BINARY_DIR}/cmbatt_cmbatt.h.gch ${SOURCE})
 
-set_target_properties(cmbatt PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8
-Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX
".sys")
-
+set_module_type(cmbatt kernelmodedriver)
 add_importlibs(cmbatt ntoskrnl hal battc wmilib)
 
 add_pch(cmbatt ${CMAKE_CURRENT_SOURCE_DIR}/cmbatt.h ${SOURCE})
-add_dependencies(cmbatt psdk bugcodes)

Modified: branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/…
==============================================================================
--- branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt [iso-8859-1] Thu Nov 
4 20:46:27 2010
@@ -7,8 +7,7 @@
 
 add_library(compbatt SHARED ${CMAKE_CURRENT_BINARY_DIR}/compbatt_compbatt.h.gch
${SOURCE})
 
-set_target_properties(compbatt PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8
-Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX
".sys")
+set_module_type(compbatt kernelmodedriver)
+add_importlibs(compbatt ntoskrnl hal battc)
 
-add_importlibs(compbatt ntoskrnl hal battc)
 add_pch(compbatt ${CMAKE_CURRENT_SOURCE_DIR}/compbatt.h ${SOURCE})
-add_dependencies(compbatt psdk bugcodes)

Modified: branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/isapn…
==============================================================================
--- branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt [iso-8859-1] Thu Nov  4
20:46:27 2010
@@ -6,9 +6,8 @@
     hardware.c
     isapnp.rc)
 
-set_target_properties(isapnp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8
-Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX
".sys")
+set_module_type(isapnp kernelmodedriver)
+add_importlibs(isapnp ntoskrnl hal)
 
-add_importlibs(isapnp ntoskrnl hal)
-add_dependencies(isapnp psdk bugcodes buildno_header)
 add_minicd_target(isapnp reactos isapnp.sys)
-add_livecd_target(isapnp reactos/system32/drivers)
+add_livecd_target(isapnp reactos/system32/drivers)