From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 3 Dec 2010 17:41:29 +0000 (+0000)
Subject: [CMAKE]
X-Git-Tag: backups/GSoC_2011/GSoC_Themes@51550~332
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=f7da79e88966c78cd295cf6e6266db3decc30f71

[CMAKE]
- Improve more modules.

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

diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt
index 8f79775c080..6ffa6f7829a 100644
--- a/dll/win32/CMakeLists.txt
+++ b/dll/win32/CMakeLists.txt
@@ -102,8 +102,8 @@ add_subdirectory(mssign32)
 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(wintrust)
 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)
diff --git a/drivers/battery/battc/CMakeLists.txt b/drivers/battery/battc/CMakeLists.txt
index ac2e45cb606..f2685c79ded 100644
--- a/drivers/battery/battc/CMakeLists.txt
+++ b/drivers/battery/battc/CMakeLists.txt
@@ -12,4 +12,4 @@ set_module_type(battc kernelmodedriver)
 add_importlibs(battc ntoskrnl hal)
 
 add_cab_target(battc 2)
-add_importlib_target(battc.spec)
\ No newline at end of file
+add_importlib_target(battc.spec batc.sys)
\ No newline at end of file
diff --git a/drivers/directx/dxgthk/CMakeLists.txt b/drivers/directx/dxgthk/CMakeLists.txt
index 3e414315a43..ebf868dd131 100644
--- a/drivers/directx/dxgthk/CMakeLists.txt
+++ b/drivers/directx/dxgthk/CMakeLists.txt
@@ -11,6 +11,6 @@ add_library(dxgthk SHARED ${SOURCE})
 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)
diff --git a/drivers/ksfilter/ks/CMakeLists.txt b/drivers/ksfilter/ks/CMakeLists.txt
index d2d6c71fa9f..b03087d0926 100644
--- a/drivers/ksfilter/ks/CMakeLists.txt
+++ b/drivers/ksfilter/ks/CMakeLists.txt
@@ -5,7 +5,7 @@ add_definitions(
     -DBUILDING_KS
     -D_COMDDK_)
 
-add_library(ks SHARED
+list(APPEND SOURCE
     api.c
     allocators.c
     bag.c
@@ -30,16 +30,18 @@ add_library(ks SHARED
     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)
\ No newline at end of file
+add_importlib_target(ks.spec ks.sys)
\ No newline at end of file
diff --git a/drivers/network/ndis/CMakeLists.txt b/drivers/network/ndis/CMakeLists.txt
index 16263ac4112..4118458842d 100644
--- a/drivers/network/ndis/CMakeLists.txt
+++ b/drivers/network/ndis/CMakeLists.txt
@@ -43,4 +43,4 @@ add_importlibs(ndis ntoskrnl hal)
 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)
diff --git a/drivers/storage/class/class2/CMakeLists.txt b/drivers/storage/class/class2/CMakeLists.txt
index 2791ec5df02..6150dcb35a8 100644
--- a/drivers/storage/class/class2/CMakeLists.txt
+++ b/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)
diff --git a/drivers/storage/ide/pciidex/CMakeLists.txt b/drivers/storage/ide/pciidex/CMakeLists.txt
index c7280cefefa..569f96774c5 100644
--- a/drivers/storage/ide/pciidex/CMakeLists.txt
+++ b/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)
diff --git a/drivers/storage/scsiport/CMakeLists.txt b/drivers/storage/scsiport/CMakeLists.txt
index 0e0bffe506a..1f937ae404f 100644
--- a/drivers/storage/scsiport/CMakeLists.txt
+++ b/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)
diff --git a/drivers/video/videoprt/CMakeLists.txt b/drivers/video/videoprt/CMakeLists.txt
index 492ca51edea..f92ed93515b 100644
--- a/drivers/video/videoprt/CMakeLists.txt
+++ b/drivers/video/videoprt/CMakeLists.txt
@@ -30,4 +30,4 @@ add_importlibs(videoprt ntoskrnl hal)
 
 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)
diff --git a/drivers/wdm/audio/drm/drmk/CMakeLists.txt b/drivers/wdm/audio/drm/drmk/CMakeLists.txt
index 71a05cfc1f4..b505da5157f 100644
--- a/drivers/wdm/audio/drm/drmk/CMakeLists.txt
+++ b/drivers/wdm/audio/drm/drmk/CMakeLists.txt
@@ -12,6 +12,6 @@ add_library(drmk SHARED ${SOURCE})
 
 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)
diff --git a/drivers/wmi/CMakeLists.txt b/drivers/wmi/CMakeLists.txt
index fc4507e827a..38b56a006ae 100644
--- a/drivers/wmi/CMakeLists.txt
+++ b/drivers/wmi/CMakeLists.txt
@@ -11,6 +11,6 @@ add_library(wmilib SHARED ${SOURCE})
 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)
diff --git a/subsystems/win32/win32k/CMakeLists.txt b/subsystems/win32/win32k/CMakeLists.txt
index 79431b523ab..d8691cda893 100644
--- a/subsystems/win32/win32k/CMakeLists.txt
+++ b/subsystems/win32/win32k/CMakeLists.txt
@@ -192,5 +192,5 @@ add_importlibs(win32k ntoskrnl hal ftfd)
 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)