Author: akhaldi
Date: Sat Sep 25 14:39:51 2010
New Revision: 48873
URL: http://svn.reactos.org/svn/reactos?rev=48873&view=rev
Log:
[CMAKE]
- Improve acpi, isapnp, pci, pcix and pcmcia (import libs, dependencies...etc)
Modified:
branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt
branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt
branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt
branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt
branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt
Modified: branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt?rev=48873&r1=48872&r2=48873&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Sat Sep
25 14:39:51 2010
@@ -1,5 +1,3 @@
-
-
include_directories(include)
include_directories(acpica/include)
@@ -143,8 +141,7 @@
target_link_libraries(acpi
wdmguid
- acpica
- -lntoskrnl
- -lhal)
+ acpica)
+add_importlibs(acpi ntoskrnl hal)
add_dependencies(acpi psdk bugcodes)
Modified: branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt?rev=48873&r1=48872&r2=48873&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt [iso-8859-1] Sat
Sep 25 14:39:51 2010
@@ -1,5 +1,3 @@
-
-
add_library(isapnp SHARED
isapnp.c
@@ -10,8 +8,5 @@
set_target_properties(isapnp PROPERTIES LINK_FLAGS "-Wl,-entry,_driveren...@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)
Modified: branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt?rev=48873&r1=48872&r2=48873&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt [iso-8859-1] Sat Sep
25 14:39:51 2010
@@ -1,5 +1,3 @@
-
-
add_library(pci SHARED
fdo.c
@@ -9,8 +7,5 @@
set_target_properties(pci PROPERTIES LINK_FLAGS "-Wl,-entry,_driveren...@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)
Modified: branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt?rev=48873&r1=48872&r2=48873&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt [iso-8859-1] Sat Sep
25 14:39:51 2010
@@ -1,5 +1,3 @@
-
-
list(APPEND SOURCE
arb/ar_busno.c
@@ -42,9 +40,7 @@
set_target_properties(pcix PROPERTIES LINK_FLAGS "-Wl,-entry,_driveren...@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)
Modified: branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt?rev=48873&r1=48872&r2=48873&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt [iso-8859-1] Sat
Sep 25 14:39:51 2010
@@ -1,5 +1,3 @@
-
-
add_library(pcmcia SHARED
fdo.c
@@ -9,8 +7,5 @@
set_target_properties(pcmcia PROPERTIES LINK_FLAGS "-Wl,-entry,_driveren...@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)
