From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 30 Oct 2010 22:03:40 +0000 (+0000)
Subject: [CMAKE]
X-Git-Tag: backups/GSoC_2011/GSoC_Themes@51550~652
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=a2e649110ba540bfd6ccb3f395ba687a5469f350

[CMAKE]
- "cmake gracefully handles def files as source files" You mean it gracefully ignores them, right ?
- Fix the kernel and class2 exports. More to come.
- Fix imaadp32.acm

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

diff --git a/dll/win32/imaadp32.acm/CMakeLists.txt b/dll/win32/imaadp32.acm/CMakeLists.txt
index e7bf314920b..98ff8ce3244 100644
--- a/dll/win32/imaadp32.acm/CMakeLists.txt
+++ b/dll/win32/imaadp32.acm/CMakeLists.txt
@@ -6,14 +6,14 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(imaadp32.acm imaadp32.acm.spec)
 
-add_library(imaadp32 SHARED imaadp32.c
+add_library(imaadp32.acm SHARED imaadp32.c
     ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.def)
 
-set_entrypoint(imaadp32 0)
-set_target_properties(imaadp32 PROPERTIES SUFFIX "acm")
+set_entrypoint(imaadp32.acm 0)
+set_target_properties(imaadp32.acm PROPERTIES SUFFIX ".acm")
 
-target_link_libraries(imaadp32 wine)
+target_link_libraries(imaadp32.acm wine)
 
-add_importlibs(imaadp32 winmm user32 msvcrt kernel32 ntdll)
-add_dependencies(imaadp32 psdk buildno_header)
-add_cab_target(imaadp32 1)
+add_importlibs(imaadp32.acm winmm user32 msvcrt kernel32 ntdll)
+add_dependencies(imaadp32.acm psdk buildno_header)
+add_cab_target(imaadp32.acm 1)
diff --git a/drivers/storage/class/class2/CMakeLists.txt b/drivers/storage/class/class2/CMakeLists.txt
index ee735cae0a1..6f0da742400 100644
--- a/drivers/storage/class/class2/CMakeLists.txt
+++ b/drivers/storage/class/class2/CMakeLists.txt
@@ -5,12 +5,12 @@ include_directories(..)
 
 spec2def(class2.sys class2.spec)
 
-add_library(class2 SHARED class2.c class2.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/class2.def)
+add_library(class2 SHARED class2.c class2.rc)
 
 set_target_properties(class2 PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
 
 target_link_libraries(class2
+    ${CMAKE_CURRENT_BINARY_DIR}/class2.def
     -lscsiport
     -lntoskrnl
     -lhal)
diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt
index f2a95a159b7..e33fb8f80e8 100644
--- a/ntoskrnl/CMakeLists.txt
+++ b/ntoskrnl/CMakeLists.txt
@@ -241,8 +241,7 @@ list(APPEND SOURCE
     vf/driver.c
     wmi/wmi.c
     ntoskrnl.rc
-    ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S
-    ${CMAKE_CURRENT_SOURCE_DIR}/ntoskrnl_${ARCH}.def)
+    ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S)
 
 if(ARCH MATCHES i386)
 list(APPEND SOURCE
@@ -405,6 +404,7 @@ add_executable(ntoskrnl ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl_ntoskrnl.
 set_target_properties(ntoskrnl PROPERTIES LINK_FLAGS "-Wl,-entry,_KiSystemStartup@4 -Wl,--image-base,0x80800000 -Wl,--subsystem,native")
 
 target_link_libraries(ntoskrnl
+    ${CMAKE_CURRENT_SOURCE_DIR}/ntoskrnl_${ARCH}.def
     cportlib
     csq
     -lhal