[ros-diffs] [jgardou] 49391: [CMAKE] - improve ntoskrnl/CMakeLists.txt

jgardou at svn.reactos.org jgardou at svn.reactos.org
Mon Nov 1 01:23:18 UTC 2010


Author: jgardou
Date: Mon Nov  1 01:23:17 2010
New Revision: 49391

URL: http://svn.reactos.org/svn/reactos?rev=49391&view=rev
Log:
[CMAKE]
  - improve ntoskrnl/CMakeLists.txt

Modified:
    branches/cmake-bringup/ntoskrnl/CMakeLists.txt

Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLists.txt?rev=49391&r1=49390&r2=49391&view=diff
==============================================================================
--- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Mon Nov  1 01:23:17 2010
@@ -241,7 +241,10 @@
     vf/driver.c
     wmi/wmi.c
     ntoskrnl.rc
-    ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S)
+    ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S
+    ntoskrnl_${ARCH}.def)
+    
+set_source_files_properties(ntoskrnl_${ARCH}.def PROPERTIES EXTERNAL_OBJECT TRUE)
 
 if(ARCH MATCHES i386)
 list(APPEND SOURCE
@@ -404,19 +407,17 @@
 set_target_properties(ntoskrnl PROPERTIES LINK_FLAGS "-Wl,-entry,_KiSystemStartup at 4 -Wl,--image-base,0x80800000 -Wl,--subsystem,native")
 
 target_link_libraries(ntoskrnl
-    ${CMAKE_CURRENT_SOURCE_DIR}/ntoskrnl_${ARCH}.def
     cportlib
     csq
-    -lhal
     pseh
     cmlib
     rtl
     rossym
     libcntpr
-    -lkdcom
-    -lbootvid
     wdmguid
     ioevent)
+    
+add_importlibs(ntoskrnl hal kdcom bootvid)
 
 add_pch(ntoskrnl ${CMAKE_CURRENT_SOURCE_DIR}/include/ntoskrnl.h ${SOURCE})
 set_source_files_properties(${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S PROPERTIES GENERATED TRUE)




More information about the Ros-diffs mailing list