Author: akhaldi Date: Fri Dec 3 10:26:32 2010 New Revision: 49914
URL: http://svn.reactos.org/svn/reactos?rev=49914&view=rev Log: [CMAKE] - More work on import lib targets and improving modules.
Modified: branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt
Modified: branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/ksprox... ============================================================================== --- branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -1,10 +1,12 @@ + spec2def(ksproxy.ax ksproxy.spec)
add_definitions(-D_DLL -D__USE_CRTIMP) - include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport) - add_definitions( +add_definitions( -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++ -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt) + +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport)
add_library(ksproxy SHARED allocator.cpp @@ -36,14 +38,11 @@ #set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") endif(MSVC)
- target_link_libraries(ksproxy - stlport -lsupc++ -lgcc + stlport -lsupc++ -lgcc -lmingw32 -lcoldname strmiids)
add_importlibs(ksproxy - mingw32 - coldname advapi32 ole32 setupapi @@ -54,4 +53,4 @@
add_dependencies(ksproxy psdk buildno_header)
-add_cab_target(ksproxy 1) +add_cab_target(ksproxy 1)
Modified: branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi32... ============================================================================== --- branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -45,10 +45,6 @@ advapi32.rc ${CMAKE_CURRENT_BINARY_DIR}/advapi32.def)
-if(NOT MSVC) - set_source_files_properties(advapi32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() - add_library(advapi32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/advapi32_advapi32.h.gch ${SOURCE}) @@ -66,5 +62,4 @@
add_pch(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.h ${SOURCE}) add_cab_target(advapi32 1) -add_importlib_target(advapi32.spec libntdll) - +add_importlib_target(advapi32.spec)
Modified: branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/browseui... ============================================================================== --- branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -1,3 +1,4 @@ + set_unicode() set_cpp()
@@ -13,6 +14,7 @@ ${REACTOS_SOURCE_DIR}/lib/atl)
set_rc_compiler() + spec2def(browseui.dll browseui.spec)
list(APPEND SOURCE @@ -45,11 +47,11 @@ target_link_libraries(browseui atlnew uuid - wine) + wine + -lmingw32 + -lcoldname)
add_importlibs(browseui - mingw32 - coldname shlwapi shell32 comctl32
Modified: branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cabinet/... ============================================================================== --- branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -20,5 +20,7 @@ target_link_libraries(cabinet wine)
add_importlibs(cabinet kernel32 ntdll) +add_importlib_target(cabinet.spec) + add_dependencies(cabinet psdk buildno_header) add_cab_target(cabinet 1)
Modified: branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptui/... ============================================================================== --- branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -1,9 +1,12 @@
-add_definitions(-D__WINESRC__) -add_definitions(-D_WINE) +add_definitions( + -D__WINESRC__ + -D_WINE) + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
set_rc_compiler() + spec2def(cryptui.dll cryptui.spec)
list(APPEND SOURCE @@ -33,5 +36,6 @@ kernel32 ntdll)
+add_importlib_target(cryptui.spec)
add_cab_target(cryptui 1)
Modified: branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dbghelp/... ============================================================================== --- branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -54,4 +54,6 @@
add_importlibs(dbghelp psapi version msvcrt kernel32 ntdll)
+add_importlib_target(dbghelp.spec) + add_cab_target(dbghelp 1)
Modified: branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dhcpcsvc... ============================================================================== --- branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -28,9 +28,9 @@
set_module_type(dhcpcsvc win32dll)
+add_importlibs(dhcpcsvc ws2_32 iphlpapi advapi32 msvcrt kernel32 ntdll) +add_importlib_target(dhcpcsvc.spec)
- -add_importlibs(dhcpcsvc ws2_32 iphlpapi advapi32 msvcrt kernel32 ntdll) add_pch(dhcpcsvc ${CMAKE_CURRENT_SOURCE_DIR}/include/rosdhcp.h ${SOURCE})
add_cab_target(dhcpcsvc 1)
Modified: branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdiplus/... ============================================================================== --- branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -1,9 +1,12 @@
-add_definitions(-D__WINESRC__) -add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions( + -D__WINESRC__ + -D_DLL -D__USE_CRTIMP) + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
set_rc_compiler() + spec2def(gdiplus.dll gdiplus.spec)
list(APPEND SOURCE @@ -26,9 +29,7 @@
set_module_type(gdiplus win32dll)
-target_link_libraries(gdiplus - uuid - wine) +target_link_libraries(gdiplus uuid wine)
add_importlibs(gdiplus msvcrt @@ -41,9 +42,10 @@ kernel32 ntdll)
+add_importlib_target(gdiplus.spec) + if(ARCH MATCHES amd64) target_link_libraries(gdiplus crt) endif(ARCH MATCHES amd64)
- add_cab_target(gdiplus 1)
Modified: branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imagehlp... ============================================================================== --- branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -1,6 +1,7 @@
-add_definitions(-D_DLL -D__USE_CRTIMP) -add_definitions(-D_IMAGEHLP_SOURCE_) +add_definitions( + -D_DLL -D__USE_CRTIMP + -D_IMAGEHLP_SOURCE_)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -23,6 +24,8 @@ target_link_libraries(imagehlp wine)
add_importlibs(imagehlp dbghelp msvcrt kernel32 ntdll) +add_importlib_target(imagehlp.spec) + add_pch(imagehlp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
add_cab_target(imagehlp 1)
Modified: branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iphlpapi... ============================================================================== --- branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -10,7 +10,7 @@
spec2def(iphlpapi.dll iphlpapi.spec)
-add_library(iphlpapi SHARED +list(APPEND SOURCE dhcp_reactos.c ifenum_reactos.c ipstats_reactos.c @@ -22,11 +22,11 @@ iphlpapi.rc ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def)
+add_library(iphlpapi SHARED ${SOURCE}) + set_module_type(iphlpapi win32dll)
-target_link_libraries(iphlpapi - wine - tdilib) +target_link_libraries(iphlpapi wine tdilib)
add_importlibs(iphlpapi dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll)
Modified: branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mlang/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -1,7 +1,9 @@
add_definitions(-D__WINESRC__) + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(mlang.dll mlang.spec) @@ -15,9 +17,7 @@
set_entrypoint(mlang 0)
-target_link_libraries(mlang - uuid - wine) +target_link_libraries(mlang uuid wine)
add_importlibs(mlang ole32 @@ -28,5 +28,7 @@ kernel32 ntdll)
+add_importlib_target(mlang.spec) + add_dependencies(mlang psdk buildno_header) -add_cab_target(mlang 1) +add_cab_target(mlang 1)
Modified: branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mscoree/... ============================================================================== --- branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -4,13 +4,16 @@
spec2def(mscoree.dll mscoree.spec)
-add_library(mscoree SHARED corruntimehost.c mscoree_main.c ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def) +list(APPEND SOURCE + corruntimehost.c + mscoree_main.c + ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def) + +add_library(mscoree SHARED ${SOURCE})
set_module_type(mscoree win32dll)
-target_link_libraries(mscoree - wine - uuid) +target_link_libraries(mscoree wine uuid)
add_importlibs(mscoree advapi32 shell32 msvcrt kernel32 ntdll)
Modified: branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt40... ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -6,7 +6,11 @@
spec2def(msvcrt40.dll msvcrt40.spec)
-add_library(msvcrt40 SHARED msvcrt40.c ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def) +list(APPEND SOURCE + msvcrt40.c + ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def) + +add_library(msvcrt40 SHARED ${SOURCE})
set_module_type(msvcrt40 win32dll)
Modified: branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/psapi/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -20,6 +20,8 @@ ${PSEH_LIB})
add_importlibs(psapi msvcrt kernel32 ntdll) +add_importlib_target(psapi.spec) + add_pch(psapi ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
add_cab_target(psapi 1)
Modified: branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched20... ============================================================================== --- branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -4,6 +4,8 @@ -D_DLL -D__USE_CRTIMP)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(riched20.dll riched20.spec)
add_library(riched20 SHARED caret.c @@ -26,17 +28,11 @@ wrap.c writer.c version.rc - riched20.def) - -if(NOT MSVC) - set_source_files_properties(riched20.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() + ${CMAKE_CURRENT_BINARY_DIR}/riched20.def)
set_module_type(riched20 win32dll)
-target_link_libraries(riched20 - wine - uuid) +target_link_libraries(riched20 wine uuid)
if(MSVC) set_target_properties(riched20 PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h") @@ -52,4 +48,6 @@ kernel32 ntdll)
+add_importlib_target(riched20.spec) + add_cab_target(riched20 1)
Modified: branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/spoolss/... ============================================================================== --- branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -16,5 +16,6 @@ target_link_libraries(spoolss wine)
add_importlibs(spoolss winspool msvcrt kernel32 ntdll) +add_importlib_target(spoolss.spec)
add_cab_target(spoolss 1)
Modified: branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufatx/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -1,14 +1,16 @@
-add_library(ufatx SHARED ufatx.rc ufatx.def) +spec2def(ufatx.dll ufatx.spec)
-if(NOT MSVC) - set_source_files_properties(ufatx.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(ufatx SHARED + ufatx.rc + ${CMAKE_CURRENT_BINARY_DIR}/ufatx.def)
set_entrypoint(ufatx 0)
-target_link_libraries(ufatx vfatxlib) +target_link_libraries(ufatx vfatxlib -lgcc)
-add_importlibs(ufatx gcc kernel32 ntdll) +add_importlibs(ufatx kernel32 ntdll) +add_importlib_target(ufatx.spec) + add_dependencies(ufatx psdk buildno_header) -add_cab_target(ufatx 1) +add_cab_target(ufatx 1)
Modified: branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/usp10/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -19,5 +19,6 @@ target_link_libraries(usp10 wine)
add_importlibs(usp10 gdi32 msvcrt kernel32 ntdll) +add_importlib_target(usp10.spec)
add_cab_target(usp10 1)
Modified: branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/windowsc... ============================================================================== --- branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -41,8 +41,9 @@
set_module_type(windowscodecs win32dll)
-target_link_libraries(windowscodecs wine) +target_link_libraries(windowscodecs wine uuid)
-add_importlibs(windowscodecs uuid ole32 shlwapi advapi32 msvcrt kernel32 ntdll) +add_importlibs(windowscodecs ole32 shlwapi advapi32 msvcrt kernel32 ntdll) +add_importlib_target(windowscodecs.spec)
add_cab_target(windowscodecs 1)
Modified: branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/dx... ============================================================================== --- branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -9,4 +9,6 @@ set_module_type(dxgthk kernelmodedriver) add_importlibs(dxgthk win32k)
-add_cab_target(dxgthk 2) +add_importlib_target(dxgthk.spec) + +add_cab_target(dxgthk 2)
-
akhaldi＠svn.reactos.org