[ros-diffs] [akhaldi] 50126: [CMAKE] - Improve some modules.

Author: akhaldi
Date: Fri Dec 24 16:12:23 2010
New Revision: 50126

URL: http://svn.reactos.org/svn/reactos?rev=50126&view=rev
Log:
[CMAKE]
- Improve some modules.

Modified:
    branches/cmake-bringup/base/services/rpcss/CMakeLists.txt
    branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt
    branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt
    branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt
    branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt
    branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt
    branches/cmake-bringup/dll/win32/sti/CMakeLists.txt

Modified: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/rpc…
==============================================================================
--- branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] Fri Dec 24
16:12:23 2010
@@ -6,8 +6,6 @@
     irotp.c
     rpcss_main.c
     service_main.c
-    epm.idl
-    irot.idl
     rpcss.rc)
 
 include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine)

Modified: branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actxprx…
==============================================================================
--- branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Fri Dec 24
16:12:23 2010
@@ -1,13 +1,14 @@
 
 add_definitions(-D__WINESRC__)
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(actxprxy SHARED usrmarshal.c actxprxy.def)
+spec2def(actxprxy.dll actxprxy.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(actxprxy.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    usrmarshal.c
+    ${CMAKE_CURRENT_BINARY_DIR}/actxprxy.def)
+
+add_library(actxprxy SHARED ${SOURCE})
 
 set_entrypoint(actxprxy 0)
 

Modified: branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleaut3…
==============================================================================
--- branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Fri Dec 24
16:12:23 2010
@@ -19,7 +19,6 @@
     variant.c
     vartype.c
     oleaut32.rc
-    oleaut32_oaidl.idl
     ${CMAKE_CURRENT_BINARY_DIR}/oleaut32.def)
 
 remove_definitions(-D_WIN32_WINNT=0x502)

Modified: branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/pstorec…
==============================================================================
--- branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt [iso-8859-1] Fri Dec 24
16:12:23 2010
@@ -17,5 +17,5 @@
 set_module_type(pstorec win32dll)
 target_link_libraries(pstorec uuid wine)
 add_importlibs(pstorec msvcrt kernel32 ntdll)
-add_dependencies(pstorec pstorec_tlb pstorec_def)
+add_dependencies(pstorec pstorec_tlb)
 add_cab_target(pstorec 1)

Modified: branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/stdole2…
==============================================================================
--- branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] Fri Dec 24
16:12:23 2010
@@ -6,8 +6,11 @@
 
 spec2def(stdole2.tlb stdole2.tlb.spec)
 
-add_library(stdole2.tlb SHARED rsrc.rc
+list(APPEND SOURCE
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/stdole2.def)
+
+add_library(stdole2.tlb SHARED ${SOURCE})
 
 set_entrypoint(stdole2.tlb 0)
 set_target_properties(stdole2.tlb PROPERTIES SUFFIX "")

Modified: branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/stdole3…
==============================================================================
--- branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] Fri Dec 24
16:12:23 2010
@@ -6,9 +6,11 @@
 
 spec2def(stdole32.tlb stdole32.tlb.spec)
 
-add_library(stdole32.tlb SHARED
+list(APPEND SOURCE
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/stdole32.def)
+
+add_library(stdole32.tlb SHARED ${SOURCE})
 
 set_entrypoint(stdole32.tlb 0)
 set_target_properties(stdole32.tlb PROPERTIES SUFFIX "")

Modified: branches/cmake-bringup/dll/win32/sti/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sti/CMa…
==============================================================================
--- branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] Fri Dec 24 16:12:23
2010
@@ -10,16 +10,15 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(sti SHARED
+spec2def(sti.dll sti.spec)
+
+list(APPEND SOURCE
     regsvr.c
     sti.c
     sti_main.c
-    sti_wia.idl
-    sti.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/sti.def)
 
-if(NOT MSVC)
-    set_source_files_properties(sti.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+add_library(sti SHARED ${SOURCE})
 
 set_entrypoint(sti 0)