[CMAKE]

add a bunch more importlib targets

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

diff --git a/dll/win32/avicap32/CMakeLists.txt b/dll/win32/avicap32/CMakeLists.txt
index aa9a2ec..b0511eb 100644 (file)
--- a/dll/win32/avicap32/CMakeLists.txt
+++ b/dll/win32/avicap32/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+spec2def(avicap32.dll avicap32.spec)
+
 set_unicode()
 
 add_library(avicap32 SHARED
@@ -8,12 +10,9 @@ add_library(avicap32 SHARED
 
 set_module_type(avicap32 win32dll)
 
-set_export_spec(avicap32 avicap32.spec)
-
-add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/avicap32.def)
-
 target_link_libraries(avicap32 wine)
 
 add_importlibs(avicap32 advapi32 user32 version kernel32 ntdll)
 
 add_cab_target(avicap32 1)
+add_importlib_target(avicap32.spec)

diff --git a/dll/win32/crypt32/CMakeLists.txt b/dll/win32/crypt32/CMakeLists.txt
index af588e4..225c786 100644 (file)
--- a/dll/win32/crypt32/CMakeLists.txt
+++ b/dll/win32/crypt32/CMakeLists.txt
@@ -51,3 +51,4 @@ target_link_libraries(crypt32
 add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll)
 
 add_cab_target(crypt32 1)
+add_importlib_target(crypt32.spec)

diff --git a/dll/win32/dnsapi/CMakeLists.txt b/dll/win32/dnsapi/CMakeLists.txt
index 30080b3..cfb2b32 100644 (file)
--- a/dll/win32/dnsapi/CMakeLists.txt
+++ b/dll/win32/dnsapi/CMakeLists.txt
@@ -31,4 +31,5 @@ target_link_libraries(dnsapi adns)
 add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll)
 add_pch(dnsapi ${CMAKE_CURRENT_SOURCE_DIR}/dnsapi/precomp.h ${SOURCE})
 add_dependencies(dnsapi psdk buildno_header)
-add_cab_target(dnsapi 1)
\ No newline at end of file
+add_cab_target(dnsapi 1)
+add_importlib_target(dnsapi.spec)

diff --git a/dll/win32/fmifs/CMakeLists.txt b/dll/win32/fmifs/CMakeLists.txt
index 5a8c2c9..76f65d4 100644 (file)
--- a/dll/win32/fmifs/CMakeLists.txt
+++ b/dll/win32/fmifs/CMakeLists.txt
@@ -21,3 +21,4 @@ set_entrypoint(fmifs InitializeFmIfs@12)
 add_importlibs(fmifs kernel32 ntdll)
 add_dependencies(fmifs psdk buildno_header)
 add_cab_target(fmifs 1)
+add_importlib_target(fmifs.spec)

diff --git a/dll/win32/imm32/CMakeLists.txt b/dll/win32/imm32/CMakeLists.txt
index 4946a50..a9ae2eb 100644 (file)
--- a/dll/win32/imm32/CMakeLists.txt
+++ b/dll/win32/imm32/CMakeLists.txt
@@ -17,3 +17,4 @@ target_link_libraries(imm32 wine)
 add_importlibs(imm32 advapi32 user32 kernel32 ntdll)
 
 add_cab_target(imm32 1)
+add_importlib_target(imm32.spec)

diff --git a/dll/win32/lsasrv/CMakeLists.txt b/dll/win32/lsasrv/CMakeLists.txt
index d76f58d..b4eb7c5 100644 (file)
--- a/dll/win32/lsasrv/CMakeLists.txt
+++ b/dll/win32/lsasrv/CMakeLists.txt
@@ -24,4 +24,5 @@ target_link_libraries(lsasrv
 
 add_importlibs(lsasrv rpcrt4 kernel32 ntdll)
 add_dependencies(lsasrv  psdk buildno_header)
-add_cab_target(lsasrv 1)
\ No newline at end of file
+add_cab_target(lsasrv 1)
+add_importlib_target(lsasrv.spec)

diff --git a/dll/win32/lz32/CMakeLists.txt b/dll/win32/lz32/CMakeLists.txt
index 0c55197..43b3b13 100644 (file)
--- a/dll/win32/lz32/CMakeLists.txt
+++ b/dll/win32/lz32/CMakeLists.txt
@@ -1,12 +1,12 @@
 
+spec2def(lz32.dll lz32.spec)
+
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(lz32 SHARED version.rc lz32.def)
-
-if(NOT MSVC)
-    set_source_files_properties(lz32.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+add_library(lz32 SHARED
+            version.rc
+            ${CMAKE_CURRENT_BINARY_DIR}/lz32.def)
 
 set_entrypoint(lz32 0)
 
@@ -14,4 +14,5 @@ target_link_libraries(lz32 wine)
 
 add_importlibs(lz32 kernel32 ntdll)
 add_dependencies(lz32 psdk buildno_header)
-add_cab_target(lz32 1)
\ No newline at end of file
+add_cab_target(lz32 1)
+add_importlib_target(lz32.spec)

diff --git a/dll/win32/mpr/CMakeLists.txt b/dll/win32/mpr/CMakeLists.txt
index c695641..780377a 100644 (file)
--- a/dll/win32/mpr/CMakeLists.txt
+++ b/dll/win32/mpr/CMakeLists.txt
@@ -23,3 +23,4 @@ target_link_libraries(mpr wine)
 add_importlibs(mpr advapi32 user32 kernel32 ntdll)
 
 add_cab_target(mpr 1)
+add_importlib_target(mpr.spec)

diff --git a/dll/win32/msacm32/CMakeLists.txt b/dll/win32/msacm32/CMakeLists.txt
index 23ff515..0e332db 100644 (file)
--- a/dll/win32/msacm32/CMakeLists.txt
+++ b/dll/win32/msacm32/CMakeLists.txt
@@ -25,3 +25,4 @@ add_importlibs(msacm32 msvcrt advapi32 user32 winmm kernel32 ntdll)
 
 add_subdirectory(msacm32.drv)
 add_cab_target(msacm32 1)
+add_importlib_target(msacm32.spec)

diff --git a/dll/win32/msimg32/CMakeLists.txt b/dll/win32/msimg32/CMakeLists.txt
index d09fe7f..3908e1f 100644 (file)
--- a/dll/win32/msimg32/CMakeLists.txt
+++ b/dll/win32/msimg32/CMakeLists.txt
@@ -1,12 +1,12 @@
 
+spec2def(msimg32.dll msimg32.spec)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 
-add_library(msimg32 SHARED msimg32_main.c msimg32.def)
-
-if(NOT MSVC)
-    set_source_files_properties(msimg32.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+add_library(msimg32 SHARED
+            msimg32_main.c
+            ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def)
 
 set_module_type(msimg32 win32dll)
 
@@ -15,3 +15,4 @@ target_link_libraries(msimg32 wine)
 add_importlibs(msimg32 gdi32 kernel32 ntdll)
 
 add_cab_target(msimg32 1)
+add_importlib_target(msimg32.spec)

diff --git a/dll/win32/msvfw32/CMakeLists.txt b/dll/win32/msvfw32/CMakeLists.txt
index 97d55d9..72372ba 100644 (file)
--- a/dll/win32/msvfw32/CMakeLists.txt
+++ b/dll/win32/msvfw32/CMakeLists.txt
@@ -20,3 +20,4 @@ target_link_libraries(msvfw32 wine)
 add_importlibs(msvfw32 winmm version comctl32 user32 gdi32 advapi32 kernel32 ntdll)
 
 add_cab_target(msvfw32 1)
+add_importlib_target(msvfw32.spec)

diff --git a/dll/win32/netapi32/CMakeLists.txt b/dll/win32/netapi32/CMakeLists.txt
index 042b81e..4319bec 100644 (file)
--- a/dll/win32/netapi32/CMakeLists.txt
+++ b/dll/win32/netapi32/CMakeLists.txt
@@ -26,3 +26,4 @@ target_link_libraries(netapi32 wine)
 add_importlibs(netapi32 iphlpapi ws2_32 advapi32 kernel32 ntdll)
 
 add_cab_target(netapi32 1)
+add_importlib_target(netapi32.spec)

diff --git a/dll/win32/newdev/CMakeLists.txt b/dll/win32/newdev/CMakeLists.txt
index ed9cf31..9b4695b 100644 (file)
--- a/dll/win32/newdev/CMakeLists.txt
+++ b/dll/win32/newdev/CMakeLists.txt
@@ -17,3 +17,4 @@ target_link_libraries(newdev wine)
 add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 kernel32 ntdll)
 
 add_cab_target(newdev 1)
+add_importlib_target(newdev.spec)

diff --git a/dll/win32/oleaut32/CMakeLists.txt b/dll/win32/oleaut32/CMakeLists.txt
index 987236f..feb9cd3 100644 (file)
--- a/dll/win32/oleaut32/CMakeLists.txt
+++ b/dll/win32/oleaut32/CMakeLists.txt
@@ -61,3 +61,4 @@ add_importlibs(oleaut32 windowscodecs ole32 rpcrt4 user32 gdi32 advapi32 comctl3
 rpcproxy(oleaut32 oleaut32_oaidl.idl oleaut32_ocidl.idl)
 
 add_cab_target(oleaut32 1)
+add_importlib_target(oleaut32.spec)

diff --git a/dll/win32/powrprof/CMakeLists.txt b/dll/win32/powrprof/CMakeLists.txt
index d3ce22e..67a0619 100644 (file)
--- a/dll/win32/powrprof/CMakeLists.txt
+++ b/dll/win32/powrprof/CMakeLists.txt
@@ -1,11 +1,12 @@
 
-set_unicode()
+spec2def(powrprof.dll powrprof.spec)
 
-add_library(powrprof SHARED powrprof.c powrprof.rc powrprof.def)
+set_unicode()
 
-if(NOT MSVC)
-    set_source_files_properties(powrprof.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+add_library(powrprof SHARED
+            powrprof.c
+            powrprof.rc
+            ${CMAKE_CURRENT_BINARY_DIR}/powrprof.def)
 
 set_module_type(powrprof win32dll)
 
@@ -14,3 +15,4 @@ target_link_libraries(powrprof wine)
 add_importlibs(powrprof advapi32 user32 comctl32 kernel32 ntdll)
 
 add_cab_target(powrprof 1)
+add_importlib_target(powrprof.spec)

diff --git a/dll/win32/samlib/CMakeLists.txt b/dll/win32/samlib/CMakeLists.txt
index 533c360..49c6a2c 100644 (file)
--- a/dll/win32/samlib/CMakeLists.txt
+++ b/dll/win32/samlib/CMakeLists.txt
@@ -11,3 +11,4 @@ set_module_type(samlib win32dll)
 add_importlibs(samlib advapi32 kernel32 ntdll)
 
 add_cab_target(samlib 1)
+add_importlib_target(samlib.spec)

diff --git a/dll/win32/secur32/CMakeLists.txt b/dll/win32/secur32/CMakeLists.txt
index 34895e6..a45559f 100644 (file)
--- a/dll/win32/secur32/CMakeLists.txt
+++ b/dll/win32/secur32/CMakeLists.txt
@@ -24,3 +24,4 @@ add_importlibs(secur32 advapi32 kernel32 ntdll)
 add_pch(secur32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 add_cab_target(secur32 1)
+add_importlib_target(secur32.spec)

diff --git a/dll/win32/smdll/CMakeLists.txt b/dll/win32/smdll/CMakeLists.txt
index aaa5fe6..93082f8 100644 (file)
--- a/dll/win32/smdll/CMakeLists.txt
+++ b/dll/win32/smdll/CMakeLists.txt
@@ -1,18 +1,17 @@
 
+spec2def(smdll.dll smdll.spec)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
 
 add_library(smdll SHARED
     dllmain.c
     query.c
     smdll.rc
-    smdll.def)
-
-if(NOT MSVC)
-    set_source_files_properties(smdll.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+    ${CMAKE_CURRENT_BINARY_DIR}/smdll.def)
 
 target_link_libraries(smdll smlib)
 
 add_importlibs(smdll ntdll)
 add_dependencies(smdll psdk buildno_header)
-add_cab_target(smdll 1)
\ No newline at end of file
+add_cab_target(smdll 1)
+add_importlib_target(smdll.spec)

diff --git a/dll/win32/userenv/CMakeLists.txt b/dll/win32/userenv/CMakeLists.txt
index bc20fdf..f148ea7 100644 (file)
--- a/dll/win32/userenv/CMakeLists.txt
+++ b/dll/win32/userenv/CMakeLists.txt
@@ -26,3 +26,4 @@ add_importlibs(userenv advapi32 user32 kernel32 ntdll)
 add_pch(userenv ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 add_cab_target(userenv 1)
+add_importlib_target(userenv.spec)

diff --git a/dll/win32/uxtheme/CMakeLists.txt b/dll/win32/uxtheme/CMakeLists.txt
index f0b8e85..d1b140a 100644 (file)
--- a/dll/win32/uxtheme/CMakeLists.txt
+++ b/dll/win32/uxtheme/CMakeLists.txt
@@ -24,3 +24,4 @@ target_link_libraries(uxtheme wine)
 add_importlibs(uxtheme user32 advapi32 gdi32 msimg32 kernel32 ntdll)
 
 add_cab_target(uxtheme 1)
+add_importlib_target(uxtheme.spec)

diff --git a/dll/win32/winspool/CMakeLists.txt b/dll/win32/winspool/CMakeLists.txt
index 703f588..9564436 100644 (file)
--- a/dll/win32/winspool/CMakeLists.txt
+++ b/dll/win32/winspool/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+spec2def(winspool.drv winspool.spec)
+
 set_unicode()
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -7,15 +9,15 @@ add_library(winspool SHARED
     info.c
     stubs.c
     winspool_winspool.stubs.c
-    winspool.rc)
+    winspool.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/winspool.def)
 
 set_target_properties(winspool PROPERTIES SUFFIX ".drv")
 set_module_type(winspool win32dll)
 
-target_link_libraries(winspool
-    ${CMAKE_CURRENT_SOURCE_DIR}/winspool_winspool.auto.def
-    wine)
+target_link_libraries(winspool wine)
 
 add_importlibs(winspool advapi32 shlwapi kernel32 ntdll)
 
 add_cab_target(winspool 1)
+add_importlib_target(winspool.spec)

diff --git a/dll/win32/ws2help/CMakeLists.txt b/dll/win32/ws2help/CMakeLists.txt
index c58bee6..5c0dea3 100644 (file)
--- a/dll/win32/ws2help/CMakeLists.txt
+++ b/dll/win32/ws2help/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+spec2def(ws2help.dll ws2help.spec)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock)
 
 add_library(ws2help SHARED
@@ -7,14 +9,11 @@ add_library(ws2help SHARED
     dllmain.c
     handle.c
     notify.c
-    ws2help.def)
-
-if(NOT MSVC)
-    set_source_files_properties(ws2help.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+    ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def)
 
 set_module_type(ws2help win32dll)
 
 add_importlibs(ws2help advapi32 ws2_32 kernel32 ntdll)
 
 add_cab_target(ws2help 1)
+add_importlib_target(ws2help.spec)