Author: akhaldi Date: Fri Dec 24 14:25:10 2010 New Revision: 50125
URL: http://svn.reactos.org/svn/reactos?rev=50125&view=rev Log: [CMAKE] - Add msi, qmgr and qmgrprxy to build.
Added: branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/msi/CMakeLists.txt
Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLis... ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Fri Dec 24 14:25:10 2010 @@ -137,8 +137,8 @@ add_subdirectory(printui) add_subdirectory(psapi) add_subdirectory(pstorec) -#add_subdirectory(qmgr) -#add_subdirectory(qmgrprxy) +add_subdirectory(qmgr) +add_subdirectory(qmgrprxy) add_subdirectory(query) add_subdirectory(rasadhlp) add_subdirectory(rasapi32)
Modified: branches/cmake-bringup/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/CMak... ============================================================================== --- branches/cmake-bringup/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/CMakeLists.txt [iso-8859-1] Fri Dec 24 14:25:10 2010 @@ -1,84 +1,92 @@ - -spec2def(msi.dll msi.spec) - -if (0)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__)
-add_library(msi SHARED - action.c - alter.c - appsearch.c - automation.c - classes.c - cond.tab.c - create.c</file> - custom.c</file> - database.c</file> - delete.c</file> - dialog.c</file> - distinct.c</file> - drop.c</file> - events.c</file> - files.c</file> - font.c</file> - format.c</file> - handle.c</file> - helpers.c</file> - insert.c</file> - install.c</file> - join.c</file> - media.c</file> - msi.c</file> - msi_main.c</file> - msiquery.c</file> - package.c</file> - preview.c</file> - record.c</file> - registry.c</file> - regsvr.c</file> - script.c</file> - select.c</file> - source.c</file> - sql.tab.c</file> - storages.c</file> - streams.c</file> - string.c</file> - suminfo.c</file> - table.c</file> - tokenize.c</file> - update.c</file> - upgrade.c</file> - where.c</file> - msi.rc</file> - ${CMAKE_CURRENT_BINARY_DIR}/msi.def) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +spec2def(msi.dll msi.spec) + +add_idl_interface(msiserver.idl) + +list(APPEND SOURCE + action.c + alter.c + appsearch.c + automation.c + classes.c + cond.tab.c + create.c + custom.c + database.c + delete.c + dialog.c + distinct.c + drop.c + events.c + files.c + font.c + format.c + handle.c + helpers.c + insert.c + install.c + join.c + media.c + msi.c + msi_main.c + msiquery.c + package.c + preview.c + record.c + registry.c + regsvr.c + script.c + select.c + source.c + sql.tab.c + storages.c + streams.c + string.c + suminfo.c + table.c + tokenize.c + update.c + upgrade.c + where.c + msi.rc + ${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c + ${CMAKE_CURRENT_BINARY_DIR}/msi.def) + +add_library(msi SHARED ${SOURCE}) + +add_interface_definitions(msi_idlheader msiserver.idl) + +add_typelib(msi_tlb msiserver.idl)
set_module_type(msi win32dll)
-target_link_libraries(msi wine uuid PSEH_LIB) +target_link_libraries(msi uuid ${PSEH_LIB} wine) + +add_dependencies(msi msi_idlheader msi_tlb)
add_importlibs(msi - kernel32 - urlmon - wininet - comctl32 - shell32 - shlwapi - cabinet - oleaut32 - ole32 - version - user32 - gdi32 - advapi32 - odbccp32 - ntdll) - -# <library>msiserver_interface</library> -# <dependency>msiserver</dependency> -# <dependency>msiheader</dependency> + advapi32 + cabinet + comctl32 + gdi32 + odbccp32 + ole32 + oleaut32 + shell32 + shlwapi + urlmon + user32 + version + wininet + msvcrt + kernel32 + ntdll)
add_cab_target(msi 1) -endif() add_importlib_target(msi.spec)
Added: branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/qmgr/CMa... ============================================================================== --- branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt [iso-8859-1] Fri Dec 24 14:25:10 2010 @@ -1,0 +1,30 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_idl_interface(qmgr_local.idl) + +spec2def(qmgr.dll qmgr.spec) + +list(APPEND SOURCE + enum_files.c + enum_jobs.c + factory.c + file.c + job.c + qmgr.c + qmgr_main.c + service.c + rsrc.rc + ${CMAKE_CURRENT_BINARY_DIR}/qmgr_local_i.c + ${CMAKE_CURRENT_BINARY_DIR}/qmgr.def) + +add_library(qmgr SHARED ${SOURCE}) + +add_interface_definitions(qmgr_idlheader qmgr_local.idl) + +set_module_type(qmgr win32dll) +target_link_libraries(qmgr uuid wine) +add_importlibs(qmgr ole32 wininet urlmon advapi32 msvcrt kernel32 ntdll) +add_cab_target(qmgr 1) +add_dependencies(qmgr qmgr_idlheader)
Propchange: branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/qmgrprxy... ============================================================================== --- branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt [iso-8859-1] Fri Dec 24 14:25:10 2010 @@ -1,0 +1,24 @@ + +add_definitions( + -D__WINESRC__ + -DREGISTER_PROXY_DLL) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_idl_interface(qmgrprxy.idl) + +spec2def(qmgrprxy.dll qmgrprxy.spec) + +list(APPEND SOURCE + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy_i.c + ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy.def) + +add_library(qmgrprxy SHARED ${SOURCE}) + +rpcproxy(qmgrprxy qmgrprxy.idl) + +set_module_type(qmgrprxy win32dll) +target_link_libraries(qmgrprxy qmgrprxy_proxy ${PSEH_LIB} wine) +add_importlibs(qmgrprxy rpcrt4 msvcrt kernel32 ntdll) +add_cab_target(qmgrprxy 1)
Propchange: branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
-
akhaldi＠svn.reactos.org