Author: spetreolle Date: Fri Oct 29 21:47:35 2010 New Revision: 49344
URL: http://svn.reactos.org/svn/reactos?rev=49344&view=rev Log: [CMAKE] Add dll/cpl and dll/3rdparty modules to build.
Modified: branches/cmake-bringup/dll/3rdparty/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt branches/cmake-bringup/dll/cpl/CMakeLists.txt branches/cmake-bringup/dll/cpl/timedate/CMakeLists.txt branches/cmake-bringup/dll/cpl/timedate/lang/fr-FR.rc branches/cmake-bringup/dll/cpl/usrmgr/CMakeLists.txt branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt
Modified: branches/cmake-bringup/dll/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/CMake... ============================================================================== --- branches/cmake-bringup/dll/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/CMakeLists.txt [iso-8859-1] Fri Oct 29 21:47:35 2010 @@ -1,7 +1,9 @@
-#add_subdirectory(dxtn)#disabled in trunk +if(NSWPAT) +add_subdirectory(dxtn) +endif() add_subdirectory(libjpeg) add_subdirectory(libpng) -#add_subdirectory(libtiff)#undefined reference to `_imp____argv' +add_subdirectory(libtiff) add_subdirectory(libxslt) -#add_subdirectory(mesa32)#FIXME +add_subdirectory(mesa32)
Modified: branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libti... ============================================================================== --- branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] Fri Oct 29 21:47:35 2010 @@ -53,8 +53,8 @@
set_entrypoint(libtiff 0)
-target_link_libraries(libtiff mingw_common zlib) +target_link_libraries(libtiff mingw_common zlib getopt)
-add_importlibs(libtiff msvcrt getopt user32 kernel32) +add_importlibs(libtiff user32 msvcrt kernel32)
add_dependencies(libtiff psdk buildno_header)
Modified: branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/mesa3... ============================================================================== --- branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] Fri Oct 29 21:47:35 2010 @@ -1,15 +1,9 @@
add_definitions( - -DUSE_EXTERNAL_DXTN_LIB + -DUSE_EXTERNAL_DXTN_LIB=1 -DBUILD_GL32 -DWIN32 - -D_WINDOWS - -D_MBCS - -DHAVE_STAT - -DHAVE_WIN32_THREADS - -D_REENTRANT - -D_WINSOCKAPI_ - -DLIBXML_STATIC) + -D_WINDOWS)
add_definitions(-D_DLL -D__USE_CRTIMP)
@@ -22,7 +16,7 @@ add_definitions(-DGL_NO_STDCALL) endif(ARCH MATCHES i386)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) +include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/main) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/glapi) @@ -261,12 +255,14 @@ set_entrypoint(mesa32 0)
if (NOT MSVC) -set_target_properties(mesa32 PROPERTIES LINK_FLAGS "-Wl,-w") +# this hides all warnings, is this really wanted ? +#add_definitions(-w) + endif(NOT MSVC)
-target_link_libraries(mesa32 ${CMAKE_CURRENT_BINARY_DIR}/src/drivers/windows/icd/mesa.def) - -add_importlibs(mesa32 gdi32 user32 ntdll) +target_link_libraries(mesa32 ${CMAKE_CURRENT_SOURCE_DIR}/src/drivers/windows/icd/mesa.def) + +add_importlibs(mesa32 gdi32 user32 msvcrt kernel32 ntdll)
add_dependencies(mesa32 psdk buildno_header)
Modified: branches/cmake-bringup/dll/cpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/CMakeLists... ============================================================================== --- branches/cmake-bringup/dll/cpl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/CMakeLists.txt [iso-8859-1] Fri Oct 29 21:47:35 2010 @@ -15,5 +15,5 @@ add_subdirectory(powercfg) add_subdirectory(sysdm) add_subdirectory(telephon) -#add_subdirectory(timedate)#FIXME: timedate\/lang/fr-FR.rc:37: syntax error -#add_subdirectory(usrmgr)#\groups.c:436: error: 'LPNMLVDISPINFO' undeclared (first use in this function) +add_subdirectory(timedate) +add_subdirectory(usrmgr)
Modified: branches/cmake-bringup/dll/cpl/timedate/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/timedate/C... ============================================================================== --- branches/cmake-bringup/dll/cpl/timedate/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/timedate/CMakeLists.txt [iso-8859-1] Fri Oct 29 21:47:35 2010 @@ -23,7 +23,9 @@ gdi32 comctl32 ws2_32 - iphlpapi) + iphlpapi + msvcrt + kernel32)
add_dependencies(timedate timedate_def) add_livecd_target(timedate reactos/system32)
Modified: branches/cmake-bringup/dll/cpl/timedate/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/timedate/l... ============================================================================== --- branches/cmake-bringup/dll/cpl/timedate/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/timedate/lang/fr-FR.rc [iso-8859-1] Fri Oct 29 21:47:35 2010 @@ -33,7 +33,7 @@ COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE - AUTOCHECKBOX "Ajuster automatiquement l'heure lors du &passage à l'heure d'été" + AUTOCHECKBOX "Ajuster automatiquement l'heure lors du &passage à l'heure d'été", IDC_AUTODAYLIGHT, 6, 132, 242, 11, WS_VISIBLE | WS_GROUP | WS_TABSTOP END
Modified: branches/cmake-bringup/dll/cpl/usrmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/usrmgr/CMa... ============================================================================== --- branches/cmake-bringup/dll/cpl/usrmgr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/usrmgr/CMakeLists.txt [iso-8859-1] Fri Oct 29 21:47:35 2010 @@ -1,8 +1,7 @@
set_unicode()
-add_definitions(-D_DLL -D__USE_CRTIMP) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(usrmgr ${CMAKE_CURRENT_SOURCE_DIR}/usrmgr.spec ${CMAKE_CURRENT_BINARY_DIR}/usrmgr.def)
@@ -26,6 +25,8 @@ gdi32 comctl32 netapi32 + msvcrt + kernel32 ntdll)
add_dependencies(usrmgr usrmgr_def)
Modified: branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshtcpip... ============================================================================== --- branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] Fri Oct 29 21:47:35 2010 @@ -15,3 +15,5 @@
add_importlibs(wshtcpip ws2_32 kernel32 ntdll) add_dependencies(wshtcpip wshtcpip_def psdk buildno_header) + +add_livecd_target(wshtcpip reactos/system32)