[ros-diffs] [jgardou] 49382: [CMAKE] - improve class2 build file - set EXTERNAL_OBJECT properties to ntdll def file

Author: jgardou
Date: Sun Oct 31 22:41:31 2010
New Revision: 49382

URL: http://svn.reactos.org/svn/reactos?rev=49382&view=rev
Log:
[CMAKE]
  - improve class2 build file
  - set EXTERNAL_OBJECT properties to ntdll def file

Modified:
    branches/cmake-bringup/dll/ntdll/CMakeLists.txt
    branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt

Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/CMakeLi…
==============================================================================
--- branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] Sun Oct 31 22:41:31 2010
@@ -18,7 +18,10 @@
     ldr/actctx.c
     rtl/libsupp.c
     rtl/version.c
-    def/ntdll.rc)
+    def/ntdll.rc
+    def/ntdll.def)
+    
+set_source_files_properties(def/ntdll.def PROPERTIES EXTERNAL_OBJECT TRUE)
 
 if(ARCH MATCHES i386)
 list(APPEND SOURCE dispatch/i386/dispatch.S)
@@ -52,4 +55,4 @@
 add_dependencies(ntdll ntstatus)
 
 add_minicd_target(ntdll reactos/system32 ntdll.dll)
-add_cab_target(ntdll 1)
+add_cab_target(ntdll 1)

Modified: branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c…
==============================================================================
--- branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] Sun
Oct 31 22:41:31 2010
@@ -5,15 +5,12 @@
 
 spec2def(class2.sys class2.spec)
 
-add_library(class2 SHARED class2.c class2.rc)
+add_library(class2 SHARED class2.c class2.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/class2.def)
 
-set_target_properties(class2 PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8
-Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX
".sys")
+set_module_type(class2 kernelmodedriver)
 
-target_link_libraries(class2
-    ${CMAKE_CURRENT_BINARY_DIR}/class2.def
-    -lscsiport
-    -lntoskrnl
-    -lhal)
+add_importlibs(class2 scsiport ntoskrnl hal)
 
 add_dependencies(class2 psdk bugcodes)
 add_minicd_target(class2 reactos class2.sys)