[CMAKE]

- Improve more modules.

svn path=/branches/cmake-bringup/; revision=49932

drivers/storage/class/class2/CMakeLists.txt

@@ -3,14 +3,17 @@ include_directories(..)
 
 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)

drivers/storage/ide/pciidex/CMakeLists.txt

@@ -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 @@ add_library(pciidex SHARED
     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)

drivers/storage/scsiport/CMakeLists.txt

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