From 29ab93ce7f13eb1b7ccf9ecd8994da7fd452de44 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 25 Sep 2010 14:39:51 +0000
Subject: [PATCH] [CMAKE] - Improve acpi, isapnp, pci, pcix and pcmcia (import
 libs, dependencies...etc)

svn path=/branches/cmake-bringup/; revision=48873
---
 drivers/bus/acpi/CMakeLists.txt   | 7 ++-----
 drivers/bus/isapnp/CMakeLists.txt | 9 ++-------
 drivers/bus/pci/CMakeLists.txt    | 7 +------
 drivers/bus/pcix/CMakeLists.txt   | 8 ++------
 drivers/bus/pcmcia/CMakeLists.txt | 7 +------
 5 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/drivers/bus/acpi/CMakeLists.txt b/drivers/bus/acpi/CMakeLists.txt
index 9a1f2a96b80..afc117b06b7 100644
--- a/drivers/bus/acpi/CMakeLists.txt
+++ b/drivers/bus/acpi/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-
-
 include_directories(include)
 include_directories(acpica/include)
 
@@ -143,8 +141,7 @@ set_target_properties(acpi PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,
 
 target_link_libraries(acpi
     wdmguid
-    acpica
-    -lntoskrnl
-    -lhal)
+    acpica)
 
+add_importlibs(acpi ntoskrnl hal)
 add_dependencies(acpi psdk bugcodes)
diff --git a/drivers/bus/isapnp/CMakeLists.txt b/drivers/bus/isapnp/CMakeLists.txt
index a9e4e08216e..b563165bf94 100644
--- a/drivers/bus/isapnp/CMakeLists.txt
+++ b/drivers/bus/isapnp/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-
-
 add_library(isapnp SHARED
     isapnp.c
     pdo.c
@@ -10,8 +8,5 @@ add_library(isapnp SHARED
 
 set_target_properties(isapnp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
 
-target_link_libraries(isapnp
-    -lntoskrnl
-    -lhal)
-
-add_dependencies(isapnp psdk bugcodes)
+add_importlibs(isapnp ntoskrnl hal)
+add_dependencies(isapnp psdk bugcodes buildno_header)
diff --git a/drivers/bus/pci/CMakeLists.txt b/drivers/bus/pci/CMakeLists.txt
index 2d45bc31e40..c9b04448dd7 100644
--- a/drivers/bus/pci/CMakeLists.txt
+++ b/drivers/bus/pci/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-
-
 add_library(pci SHARED
     fdo.c
     pci.c
@@ -9,8 +7,5 @@ add_library(pci SHARED
 
 set_target_properties(pci PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys")
 
-target_link_libraries(pci
-    -lntoskrnl
-    -lhal)
-
+add_importlibs(pci ntoskrnl hal)
 add_dependencies(pci psdk bugcodes buildno_header)
diff --git a/drivers/bus/pcix/CMakeLists.txt b/drivers/bus/pcix/CMakeLists.txt
index 8dc67bc9ae8..6553b6db020 100644
--- a/drivers/bus/pcix/CMakeLists.txt
+++ b/drivers/bus/pcix/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-
-
 list(APPEND SOURCE
     arb/ar_busno.c
     arb/ar_memio.c
@@ -42,9 +40,7 @@ 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")
 
-target_link_libraries(pcix
-    -lntoskrnl
-    -lhal)
+add_importlibs(pcix ntoskrnl hal)
 
 add_pch(pcix ${CMAKE_CURRENT_SOURCE_DIR}/pci.h ${SOURCE})
-add_dependencies(pcix pcix_def psdk pciclass)
+add_dependencies(pcix pcix_def psdk pciclass buildno_header)
diff --git a/drivers/bus/pcmcia/CMakeLists.txt b/drivers/bus/pcmcia/CMakeLists.txt
index be0b8cee7d2..b3c52c0f19f 100644
--- a/drivers/bus/pcmcia/CMakeLists.txt
+++ b/drivers/bus/pcmcia/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-
-
 add_library(pcmcia SHARED
     fdo.c
     pcmcia.c
@@ -9,8 +7,5 @@ add_library(pcmcia SHARED
 
 set_target_properties(pcmcia PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys")
 
-target_link_libraries(pcmcia
-    -lntoskrnl
-    -lhal)
-
+add_importlibs(pcmcia ntoskrnl hal)
 add_dependencies(pcmcia psdk bugcodes buildno_header)
-- 
2.17.1