[ros-diffs] [reactos] 01/01: [ACLEDIT][ATL][ATL80][FLTMGR] Get the def files out of the source files lists. #179

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6cb9f60d18626bc35522…

commit d6cb9f60d18626bc355223fed18d4f90940078c7
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sat Dec 9 19:58:43 2017 +0100

    [ACLEDIT][ATL][ATL80][FLTMGR] Get the def files out of the source files lists. #179
---
 dll/win32/acledit/CMakeLists.txt      |  7 +++++--
 dll/win32/atl/CMakeLists.txt          | 10 +++++++---
 dll/win32/atl80/CMakeLists.txt        |  6 ++++--
 drivers/filters/fltmgr/CMakeLists.txt | 17 +++++++++--------
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/dll/win32/acledit/CMakeLists.txt b/dll/win32/acledit/CMakeLists.txt
index 99382a542b..fb2222b02f 100644
--- a/dll/win32/acledit/CMakeLists.txt
+++ b/dll/win32/acledit/CMakeLists.txt
@@ -4,10 +4,13 @@ spec2def(acledit.dll acledit.spec)
 list(APPEND SOURCE
     acledit.c
     stubs.c
-    acleditint.h
+    acleditint.h)
+
+add_library(acledit SHARED
+    ${SOURCE}
+    acledit.rc
     ${CMAKE_CURRENT_BINARY_DIR}/acledit.def)
 
-add_library(acledit SHARED ${SOURCE} acledit.rc)
 set_module_type(acledit win32dll UNICODE)
 add_importlibs(acledit msvcrt kernel32 ntdll)
 add_pch(acledit acleditint.h SOURCE)
diff --git a/dll/win32/atl/CMakeLists.txt b/dll/win32/atl/CMakeLists.txt
index 77904a2317..9697e5c0a5 100644
--- a/dll/win32/atl/CMakeLists.txt
+++ b/dll/win32/atl/CMakeLists.txt
@@ -14,9 +14,8 @@ list(APPEND SOURCE
     atl30.c
     atl_ax.c
     registrar.c
-    precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/atl_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/atl.def)
+    precomp.h)
 
 list(APPEND atl_rc_deps
     ${CMAKE_CURRENT_SOURCE_DIR}/atl.rgs
@@ -25,7 +24,12 @@ list(APPEND atl_rc_deps
     ${CMAKE_CURRENT_BINARY_DIR}/atl_lib.tlb)
 
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS
"${atl_rc_deps}")
-add_library(atl SHARED ${SOURCE} rsrc.rc)
+
+add_library(atl SHARED
+    ${SOURCE}
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/atl.def)
+
 add_typelib(atl_lib.idl)
 add_dependencies(atl stdole2)
 set_module_type(atl win32dll)
diff --git a/dll/win32/atl80/CMakeLists.txt b/dll/win32/atl80/CMakeLists.txt
index 38d395b56a..6283b496ae 100644
--- a/dll/win32/atl80/CMakeLists.txt
+++ b/dll/win32/atl80/CMakeLists.txt
@@ -13,11 +13,13 @@ list(APPEND SOURCE
     atl80.c
     ${REACTOS_SOURCE_DIR}/dll/win32/atl/atl_ax.c
     ${REACTOS_SOURCE_DIR}/dll/win32/atl/registrar.c
-    precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/atl80_stubs.c
+    precomp.h)
+
+add_library(atl80 SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/atl80.def)
 
-add_library(atl80 SHARED ${SOURCE})
 set_module_type(atl80 win32dll)
 target_link_libraries(atl80 uuid wine)
 add_importlibs(atl80 oleaut32 user32 ole32 gdi32 advapi32 advapi32_vista shlwapi msvcrt
kernel32 ntdll)
diff --git a/drivers/filters/fltmgr/CMakeLists.txt
b/drivers/filters/fltmgr/CMakeLists.txt
index cb6ebbdd18..85199741d2 100644
--- a/drivers/filters/fltmgr/CMakeLists.txt
+++ b/drivers/filters/fltmgr/CMakeLists.txt
@@ -1,3 +1,10 @@
+
+include_directories(
+    ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers/fltmgr
+    includes)
+
+spec2def(fltmgr.sys fltmgr.spec ADD_IMPORTLIB)
+
 list(APPEND SOURCE
     Context.c
     Dispatch.c
@@ -9,18 +16,12 @@ list(APPEND SOURCE
     Object.c
     Registry.c
     Volume.c
-    ${CMAKE_CURRENT_BINARY_DIR}/fltmgr.def
     fltmgr.h)
 
-include_directories(
-    ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers/fltmgr
-    includes)
-
-spec2def(fltmgr.sys fltmgr.spec ADD_IMPORTLIB)
-
 add_library(fltmgr SHARED
     ${SOURCE}
-    fltmgr.rc)
+    fltmgr.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/fltmgr.def)
 
 set_module_type(fltmgr kernelmodedriver)
 target_link_libraries(fltmgr ${PSEH_LIB})