[ros-diffs] [tkreuzer] 49765: [CMAKE] Add a number of importlib targets

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Wed Nov 24 08:55:07 UTC 2010


Author: tkreuzer
Date: Wed Nov 24 08:55:07 2010
New Revision: 49765

URL: http://svn.reactos.org/svn/reactos?rev=49765&view=rev
Log:
[CMAKE]
Add a number of importlib targets

Modified:
    branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt
    branches/cmake-bringup/dll/directx/dsound/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt
    branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt
    branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt
    branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt
    branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt
    branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt
    branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt
    branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt
    branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt
    branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt
    branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt
    branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt
    branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt
    branches/cmake-bringup/dll/win32/version/CMakeLists.txt
    branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt
    branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt
    branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt

Modified: branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -31,4 +31,5 @@
 
 add_dependencies(dinput8 psdk buildno_header)
 
-add_cab_target(dinput8 1)
+add_cab_target(dinput8 1)
+add_importlib_target(dinput8.spec)

Modified: branches/cmake-bringup/dll/directx/dsound/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dsound/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/directx/dsound/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/dsound/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -38,3 +38,4 @@
 
 
 add_cab_target(dsound 1)
+add_importlib_target(dsound.spec)

Modified: branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -44,3 +44,4 @@
 
 add_dependencies(d3d9 wineheaders)
 add_cab_target(d3d9 1)
+add_importlib_target(d3d9.spec)

Modified: branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -50,4 +50,5 @@
     ntdll)
 
 add_dependencies(ddraw wineheaders)
-add_cab_target(ddraw 1)
+add_cab_target(ddraw 1)
+add_importlib_target(ddraw.spec)

Modified: branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -67,3 +67,4 @@
     ntdll)
 
 add_cab_target(comctl32 1)
+add_importlib_target(comctl32.spec)

Modified: branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -39,3 +39,4 @@
 
 
 add_cab_target(comdlg32 1)
+add_importlib_target(comdlg32.spec)

Modified: branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -31,3 +31,4 @@
 add_pch(devmgr ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 add_cab_target(devmgr 1)
+add_importlib_target(devmgr.spec)

Modified: branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -31,3 +31,4 @@
 add_importlibs(iphlpapi dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll)
 
 add_cab_target(iphlpapi 1)
+add_importlib_target(iphlpapi.spec)

Modified: branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -18,3 +18,4 @@
 add_importlibs(loadperf kernel32 ntdll)
 
 add_cab_target(loadperf 1)
+add_importlib_target(loadperf.spec)

Modified: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -73,4 +73,5 @@
 add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll)
     
 add_dependencies(ole32 ole32idl)
-add_cab_target(ole32 1)
+add_cab_target(ole32 1)
+add_importlib_target(ole32.spec)

Modified: branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -56,3 +56,4 @@
 
 
 add_cab_target(setupapi 1)
+add_importlib_target(setupapi.spec)

Modified: branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -52,3 +52,4 @@
 
 add_dependencies(shdocvw shdocvw_v1 shdocvw_def)
 add_cab_target(shdocvw 1)
+add_importlib_target(shdocvw.spec)

Modified: branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -1,3 +1,6 @@
+
+spec2def(shell32.dll shell32.spec)
+
 list(APPEND SOURCE
     authors.c
     autocomplete.c
@@ -61,8 +64,6 @@
 add_definitions(-DCOM_NO_WINDOWS_H)
 add_definitions(-D_WINE)
 
-spec2def(shell32.dll shell32.spec)
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 include_directories(${REACTOS_SOURCE_DIR}/lib/recyclebin)
 include_directories(${REACTOS_SOURCE_DIR})
@@ -95,5 +96,5 @@
 
 
 add_cab_target(shell32 1)
-add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/shell32.def)
+add_importlib_target(shell32.spec)
 

Modified: branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -51,3 +51,4 @@
 
 
 add_cab_target(shlwapi 1)
+add_importlib_target(shlwapi.spec)

Modified: branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -16,3 +16,4 @@
 add_importlibs(snmpapi kernel32 ntdll)
 
 add_cab_target(snmpapi 1)
+add_importlib_target(snmpapi.spec)

Modified: branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -66,3 +66,4 @@
 
 rpcproxy(urlmon urlmon_urlmon.idl)
 add_cab_target(urlmon 1)
+add_importlib_target(urlmon.spec)

Modified: branches/cmake-bringup/dll/win32/version/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/version/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/version/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/version/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -1,3 +1,5 @@
+
+spec2def(version.dll version.spec)
 
 add_definitions(-D__WINESRC__)
 
@@ -8,11 +10,7 @@
     install.c
     resource.c
     version.rc
-    version.def)
-
-if(NOT MSVC)
-    set_source_files_properties(version.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+    ${CMAKE_CURRENT_BINARY_DIR}/version.def)
 
 set_entrypoint(version 0)
 
@@ -20,4 +18,5 @@
 
 add_importlibs(version lz32 kernel32 ntdll)
 add_dependencies(version psdk buildno_header)
-add_cab_target(version 1)
+add_cab_target(version 1)
+add_importlib_target(version.spec)

Modified: branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -35,3 +35,4 @@
 add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 secur32 crypt32 ws2_32 msvcrt kernel32 ntdll)
 
 add_cab_target(wininet 1)
+add_importlib_target(wininet.spec)

Modified: branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -30,3 +30,4 @@
 
 add_subdirectory(midimap)
 add_cab_target(winmm 1)
+add_importlib_target(winmm.spec)

Modified: branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt?rev=49765&r1=49764&r2=49765&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010
@@ -33,3 +33,4 @@
 add_pch(ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/include/ws2_32.h ${SOURCE})
 
 add_cab_target(ws2_32 1)
+add_importlib_target(ws2_32.spec)




More information about the Ros-diffs mailing list