[CMAKE]

- Fix winspool import lib target.
- Improve some modules.

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

dll/win32/ole32/CMakeLists.txt

@@ -1,3 +1,4 @@
+
 list(APPEND SOURCE
     antimoniker.c
     bindctx.c
@@ -40,15 +41,18 @@ list(APPEND SOURCE
 
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
-add_definitions(-D__WINESRC__)
-add_definitions(-D_OLE32_)
-add_definitions(-DENTRY_PREFIX=OLE32_)
-add_definitions(-DPROXY_CLSID=CLSID_PSFactoryBuffer)
-add_definitions(-DREGISTER_PROXY_DLL)
-add_definitions(-DCOM_NO_WINDOWS_H)
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+add_definitions(
+    -D__WINESRC__
+    -D_OLE32_
+    -DENTRY_PREFIX=OLE32_
+    -DPROXY_CLSID=CLSID_PSFactoryBuffer
+    -DREGISTER_PROXY_DLL
+    -DCOM_NO_WINDOWS_H)
+
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 ADD_INTERFACE_DEFINITIONS(ole32idl dcom.idl irot.idl)
 rpcproxy(ole32
@@ -74,4 +78,4 @@ add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll)
     
 add_dependencies(ole32 ole32idl)
 add_cab_target(ole32 1)
-add_importlib_target(ole32.spec)
+add_importlib_target(ole32.spec)

dll/win32/oleaut32/CMakeLists.txt

@@ -1,3 +1,4 @@
+
 list(APPEND SOURCE
     connpt.c
     dispatch.c
@@ -23,24 +24,28 @@ list(APPEND SOURCE
 
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
-add_definitions(-D__WINESRC__)
+
 #FIXME: this should be quotes enclosed
 add_definitions(-DPROXY_CLSID_IS={0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}})
 #add_definitions(-DPROXY_CLSID_IS="{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}")
 
-add_definitions(-DCOM_NO_WINDOWS_H)
-add_definitions(-D_OLEAUT32_)
-add_definitions(-DPROXY_DELEGATION)
-add_definitions(-DREGISTER_PROXY_DLL)
-add_definitions(-DENTRY_PREFIX=OLEAUTPS_)
+add_definitions(
+    -D__WINESRC__
+    -DCOM_NO_WINDOWS_H
+    -D_OLEAUT32_
+    -DPROXY_DELEGATION
+    -DREGISTER_PROXY_DLL
+    -DENTRY_PREFIX=OLEAUTPS_)
+
 if(MSC)
 # seems to work, but is this correct ?
 # <compilerflag compilerset="msc">/FIwine/typeof.h</compilerflag>
 add_definitions(/FIwine/typeof.h)
 endif(MSC)
 
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg
+    ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(oleaut32.dll oleaut32.spec)
 
@@ -57,7 +62,6 @@ target_link_libraries(oleaut32
 
 add_importlibs(oleaut32 windowscodecs ole32 rpcrt4 user32 gdi32 advapi32 comctl32 urlmon msvcrt kernel32 ntdll)
 
-
 rpcproxy(oleaut32 oleaut32_oaidl.idl oleaut32_ocidl.idl)
 
 add_cab_target(oleaut32 1)

dll/win32/rpcrt4/CMakeLists.txt

@@ -24,9 +24,11 @@ list(APPEND SOURCE
 
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
-add_definitions(-D_RPCRT4_)
-add_definitions(-DCOM_NO_WINDOWS_H)
-add_definitions(-DMSWMSG)
+
+add_definitions(
+    -D_RPCRT4_
+    -DCOM_NO_WINDOWS_H
+    -DMSWMSG)
 
 spec2def(rpcrt4.dll rpcrt4.spec)
 
@@ -34,8 +36,10 @@ add_library(rpcrt4 SHARED ${SOURCE})
 
 set_module_type(rpcrt4 win32dll)
 
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/include/reactos/wine
+    ${REACTOS_BINARY_DIR}/include/reactos/wine)
+
 target_link_libraries(rpcrt4
     wine
     uuid
@@ -46,4 +50,3 @@ add_importlibs(rpcrt4 msvcrt user32 advapi32 secur32 iphlpapi ws2_32 kernel32 nt
 add_dependencies(rpcrt4 winesdk)
 add_cab_target(rpcrt4 1)
 add_importlib_target(rpcrt4.spec)
-

dll/win32/winspool/CMakeLists.txt

@@ -23,4 +23,4 @@ target_link_libraries(winspool wine)
 add_importlibs(winspool advapi32 shlwapi msvcrt kernel32 ntdll)
 
 add_cab_target(winspool 1)
-add_importlib_target(winspool.spec)
+add_importlib_target(winspool.spec winspool.drv)