Author: akhaldi Date: Fri Nov 5 12:02:12 2010 New Revision: 49479
URL: http://svn.reactos.org/svn/reactos?rev=49479&view=rev Log: [CMAKE] - Improve most of the static libraries.
Modified: branches/cmake-bringup/lib/CMakeLists.txt branches/cmake-bringup/lib/epsapi/CMakeLists.txt branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt branches/cmake-bringup/lib/lsalib/CMakeLists.txt branches/cmake-bringup/lib/nls/idna/CMakeLists.txt branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt branches/cmake-bringup/lib/recyclebin/CMakeLists.txt branches/cmake-bringup/lib/rtl/CMakeLists.txt branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt branches/cmake-bringup/lib/sdk/dxguid/CMakeLists.txt branches/cmake-bringup/lib/sdk/ioevent/CMakeLists.txt branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt branches/cmake-bringup/lib/sdk/strmiids/CMakeLists.txt branches/cmake-bringup/lib/sdk/wdmguid/CMakeLists.txt branches/cmake-bringup/lib/tdilib/CMakeLists.txt
Modified: branches/cmake-bringup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.txt... ============================================================================== --- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -13,7 +13,7 @@ add_subdirectory(epsapi) add_subdirectory(fslib) add_subdirectory(lsalib) -add_subdirectory(nls) +#add_subdirectory(nls) add_subdirectory(ntdllsys) add_subdirectory(ppcmmu) add_subdirectory(pseh)
Modified: branches/cmake-bringup/lib/epsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/epsapi/CMakeLi... ============================================================================== --- branches/cmake-bringup/lib/epsapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/epsapi/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,4 +1,5 @@
-file(GLOB_RECURSE SOURCE "*.c") - -add_library(epsapi ${SOURCE}) +add_library(epsapi + enum/drivers.c + enum/modules.c + enum/processes.c)
Modified: branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/ext2lib/... ============================================================================== --- branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,4 +1,13 @@
-file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + Badblock.c + Bitmap.c + Disk.c + Group.c + Inode.c + Memory.c + Mke2fs.c + Super.c + Uuid.c) add_library(ext2lib ${SOURCE}) -add_dependencies(ext2lib psdk) +add_dependencies(ext2lib psdk)
Modified: branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/ntfslib/... ============================================================================== --- branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,3 +1,2 @@
-file(GLOB_RECURSE SOURCE "*.c") -add_library(ntfslib ${SOURCE}) +add_library(ntfslib ntfslib.c)
Modified: branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/vfatlib/... ============================================================================== --- branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,4 +1,15 @@
-file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + check/boot.c + check/check.c + check/common.c + check/fat.c + check/file.c + check/io.c + check/lfn.c + fat12.c + fat16.c + fat32.c + vfatlib.c) add_library(vfatlib ${SOURCE}) add_dependencies(vfatlib psdk)
Modified: branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/vfatxlib... ============================================================================== --- branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,3 +1,2 @@
-file(GLOB_RECURSE SOURCE "*.c") -add_library(vfatxlib ${SOURCE}) +add_library(vfatxlib fatx.c vfatxlib.c)
Modified: branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/host/wcsfuncs/... ============================================================================== --- branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,4 +1,2 @@
-file(GLOB_RECURSE SOURCE "*.c") -add_library(host_wcsfuncs ${SOURCE}) - +add_library(host_wcsfuncs wcsfuncs.c)
Modified: branches/cmake-bringup/lib/lsalib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/lsalib/CMakeLi... ============================================================================== --- branches/cmake-bringup/lib/lsalib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/lsalib/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,5 +1,3 @@ + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) - -file(GLOB_RECURSE SOURCE "*.c") - -add_library(lsalib ${SOURCE}) +add_library(lsalib lsa.c)
Modified: branches/cmake-bringup/lib/nls/idna/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/idna/CMake... ============================================================================== --- branches/cmake-bringup/lib/nls/idna/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/nls/idna/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -5,6 +5,4 @@ remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line add_definitions(-DWINVER=0x600) # And now we add our own
-file(GLOB_RECURSE SOURCE "*.cpp") - -add_library(idna ${SOURCE}) +add_library(idna idna.cpp nameprep.cpp)
Modified: branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/normalize/... ============================================================================== --- branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -5,6 +5,4 @@ remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line add_definitions(-DWINVER=0x600) # And now we add our own
-file(GLOB_RECURSE SOURCE "*.cpp") - -add_library(normalize ${SOURCE}) +add_library(normalize normalize.cpp)
Modified: branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/scripts/CM... ============================================================================== --- branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -5,6 +5,4 @@ remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line add_definitions(-DWINVER=0x600) # And now we add our own
-file(GLOB_RECURSE SOURCE "*.cpp") - -add_library(scripts ${SOURCE}) +add_library(scripts scripts.cpp)
Modified: branches/cmake-bringup/lib/recyclebin/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/recyclebin/CMa... ============================================================================== --- branches/cmake-bringup/lib/recyclebin/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/recyclebin/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,3 +1,10 @@
-file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + guid.c + recyclebin.c + recyclebin_generic.c + recyclebin_generic_enumerator.c + recyclebin_v5.c + recyclebin_v5_enumerator.c) + add_library(recyclebin ${SOURCE})
Modified: branches/cmake-bringup/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/CMakeLists... ============================================================================== --- branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,8 +1,9 @@
-add_definitions(-D_NTOSKRNL_) -add_definitions(-DNO_RTL_INLINES) -add_definitions(-D_NTSYSTEM_) -add_definitions(-D_NTDLLBUILD_) +add_definitions( + -D_NTOSKRNL_ + -DNO_RTL_INLINES + -D_NTSYSTEM_ + -D_NTDLLBUILD_)
list(APPEND SOURCE access.c @@ -97,6 +98,6 @@ powerpc/thread.c) endif(ARCH MATCHES i386)
-add_library(rtl ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/rtl_rtl.h.gch) +add_library(rtl ${CMAKE_CURRENT_BINARY_DIR}/rtl_rtl.h.gch ${SOURCE}) add_pch(rtl ${CMAKE_CURRENT_SOURCE_DIR}/rtl.h ${SOURCE}) add_dependencies(rtl psdk)
Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMakeL... ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -410,7 +410,7 @@ math/amd64/tan.S) endif(ARCH MATCHES amd64)
-add_library(crt ${CRT_SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/crt_precomp.h.gch) +add_library(crt ${CMAKE_CURRENT_BINARY_DIR}/crt_precomp.h.gch ${CRT_SOURCE})
set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) add_pch(crt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${CRT_SOURCE})
Modified: branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/delayimp/C... ============================================================================== --- branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,4 +1,3 @@
add_definitions(-DUNICODE -D_UNICODE) -file(GLOB_RECURSE SOURCE "*.c") -add_library(delayimp ${SOURCE}) +add_library(delayimp delayimp.c)
Modified: branches/cmake-bringup/lib/sdk/dxguid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/dxguid/CMa... ============================================================================== --- branches/cmake-bringup/lib/sdk/dxguid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/dxguid/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,3 +1,2 @@
-file(GLOB_RECURSE SOURCE "*.c") -add_library(dxguid ${SOURCE}) +add_library(dxguid dxguid-mingw.c)
Modified: branches/cmake-bringup/lib/sdk/ioevent/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/ioevent/CM... ============================================================================== --- branches/cmake-bringup/lib/sdk/ioevent/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/ioevent/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,3 +1,2 @@
-file(GLOB_RECURSE SOURCE "*.c") -add_library(ioevent ${SOURCE}) +add_library(ioevent ioevent.c)
Modified: branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/scrnsave/C... ============================================================================== --- branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,6 +1,4 @@
add_definitions(-DUNICODE -D_UNICODE) -file(GLOB_RECURSE SOURCE "*.c") -add_library(scrnsave ${SOURCE}) - -add_dependencies(scrnsave psdk) +add_library(scrnsave scrnsave.c) +add_dependencies(scrnsave psdk)
Modified: branches/cmake-bringup/lib/sdk/strmiids/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/strmiids/C... ============================================================================== --- branches/cmake-bringup/lib/sdk/strmiids/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/strmiids/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,3 +1,2 @@
-file(GLOB_RECURSE SOURCE "*.c") -add_library(strmiids ${SOURCE}) +add_library(strmiids strmiids.c)
Modified: branches/cmake-bringup/lib/sdk/wdmguid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/wdmguid/CM... ============================================================================== --- branches/cmake-bringup/lib/sdk/wdmguid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/wdmguid/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,3 +1,2 @@
-file(GLOB_RECURSE SOURCE "*.c") -add_library(wdmguid ${SOURCE}) +add_library(wdmguid wdmguid.c)
Modified: branches/cmake-bringup/lib/tdilib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/tdilib/CMakeLi... ============================================================================== --- branches/cmake-bringup/lib/tdilib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/tdilib/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,6 +1,5 @@ + # FIXFIX: You guys should move this header in include/reactos/libs/iphlpapi! include_directories(${REACTOS_SOURCE_DIR}/dll/win32/iphlpapi) - -file(GLOB_RECURSE SOURCE "*.c") - -add_library(tdilib ${SOURCE}) +add_library(tdilib enum.c handle.c) +add_dependencies(tdilib psdk)