[CMAKE]

- Improve more libs.

svn path=/branches/cmake-bringup/; revision=49490

diff --git a/lib/3rdparty/cardlib/CMakeLists.txt b/lib/3rdparty/cardlib/CMakeLists.txt
index 2f28e32..13f6b2e 100644 (file)
--- a/lib/3rdparty/cardlib/CMakeLists.txt
+++ b/lib/3rdparty/cardlib/CMakeLists.txt
@@ -1,4 +1,16 @@
-file(GLOB_RECURSE SOURCE "*.cpp")
+
+list(APPEND SOURCE
+    cardbitmaps.cpp
+    cardbutton.cpp
+    cardcolor.cpp
+    cardcount.cpp
+    cardlib.cpp
+    cardregion.cpp
+    cardrgndraw.cpp
+    cardrgnmouse.cpp
+    cardstack.cpp
+    cardwindow.cpp
+    dropzone.cpp)
 
 add_library(cardlib ${SOURCE})
-add_dependencies(cardlib psdk)
\ No newline at end of file
+add_dependencies(cardlib psdk)

diff --git a/lib/3rdparty/expat/CMakeLists.txt b/lib/3rdparty/expat/CMakeLists.txt
index 1b0aa41..2d35cfc 100644 (file)
--- a/lib/3rdparty/expat/CMakeLists.txt
+++ b/lib/3rdparty/expat/CMakeLists.txt
@@ -1,9 +1,13 @@
 
-include_directories(lib)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/expat)
+include_directories(
+    lib
+    ${REACTOS_SOURCE_DIR}/include/reactos/libs/expat)
 
 add_definitions(-DHAVE_EXPAT_CONFIG_H)
-file(GLOB_RECURSE SOURCE "lib/*.c")
-LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/lib/xmltok_impl.c ${CMAKE_CURRENT_SOURCE_DIR}/lib/xmltok_ns.c)
 
-add_library(expat ${SOURCE})
\ No newline at end of file
+list(APPEND SOURCE
+    lib/xmlparse.c
+    lib/xmlrole.c
+    lib/xmltok.c)
+
+add_library(expat ${SOURCE})

diff --git a/lib/3rdparty/freetype/CMakeLists.txt b/lib/3rdparty/freetype/CMakeLists.txt
index adb9382..578f46d 100644 (file)
--- a/lib/3rdparty/freetype/CMakeLists.txt
+++ b/lib/3rdparty/freetype/CMakeLists.txt
@@ -1,51 +1,52 @@
-add_definitions(-D__NTDRIVER__)
-add_definitions(-DFT2_BUILD_LIBRARY)
-add_definitions(-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER)
+
+add_definitions(
+    -D__NTDRIVER__
+    -DFT2_BUILD_LIBRARY
+    -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER)
 
 include_directories(include)
 
-set(SOURCE
-  "src/autofit/autofit.c"
-  "src/base/ftbase.c"
-  "src/base/ftbbox.c"
-  "src/base/ftbdf.c"
-  "src/base/ftbitmap.c"
-  "src/base/ftdebug.c"
-  "src/base/ftgasp.c"
-  "src/base/ftglyph.c"
-  "src/base/ftgxval.c"
-  "src/base/ftinit.c"
-  "src/base/ftlcdfil.c"
-  "src/base/ftmm.c"
-  "src/base/ftotval.c"
-  "src/base/ftpatent.c"
-  "src/base/ftpfr.c"
-  "src/base/ftstroke.c"
-  "src/base/ftsynth.c"
-  "src/base/ftsystem.c"
-  "src/base/fttype1.c"
-  "src/base/ftwinfnt.c"
-  "src/base/ftxf86.c"
-  "src/bdf/bdf.c"
-  "src/cache/ftcache.c"
-  "src/cff/cff.c"
-  "src/cid/type1cid.c"
-  "src/gxvalid/gxvalid.c"
-  "src/gzip/ftgzip.c"
-  "src/lzw/ftlzw.c"
-  "src/otvalid/otvalid.c"
-  "src/pcf/pcf.c"
-  "src/pfr/pfr.c"
-  "src/psaux/psaux.c"
-  "src/pshinter/pshinter.c"
-  "src/psnames/psnames.c"
-  "src/raster/raster.c"
-  "src/sfnt/sfnt.c"
-  "src/smooth/smooth.c"
-  "src/truetype/truetype.c"
-  "src/type1/type1.c"
-  "src/type42/type42.c"
-  "src/winfonts/winfnt.c"
-)
+list(APPEND SOURCE
+  src/autofit/autofit.c
+  src/base/ftbase.c
+  src/base/ftbbox.c
+  src/base/ftbdf.c
+  src/base/ftbitmap.c
+  src/base/ftdebug.c
+  src/base/ftgasp.c
+  src/base/ftglyph.c
+  src/base/ftgxval.c
+  src/base/ftinit.c
+  src/base/ftlcdfil.c
+  src/base/ftmm.c
+  src/base/ftotval.c
+  src/base/ftpatent.c
+  src/base/ftpfr.c
+  src/base/ftstroke.c
+  src/base/ftsynth.c
+  src/base/ftsystem.c
+  src/base/fttype1.c
+  src/base/ftwinfnt.c
+  src/base/ftxf86.c
+  src/bdf/bdf.c
+  src/cache/ftcache.c
+  src/cff/cff.c
+  src/cid/type1cid.c
+  src/gxvalid/gxvalid.c
+  src/gzip/ftgzip.c
+  src/lzw/ftlzw.c
+  src/otvalid/otvalid.c
+  src/pcf/pcf.c
+  src/pfr/pfr.c
+  src/psaux/psaux.c
+  src/pshinter/pshinter.c
+  src/psnames/psnames.c
+  src/raster/raster.c
+  src/sfnt/sfnt.c
+  src/smooth/smooth.c
+  src/truetype/truetype.c
+  src/type1/type1.c
+  src/type42/type42.c
+  src/winfonts/winfnt.c)
 
-add_library(freetype ${SOURCE})
\ No newline at end of file
+add_library(freetype ${SOURCE})

diff --git a/lib/drivers/sound/soundblaster/CMakeLists.txt b/lib/drivers/sound/soundblaster/CMakeLists.txt
index 4403a7e..188f54b 100644 (file)
--- a/lib/drivers/sound/soundblaster/CMakeLists.txt
+++ b/lib/drivers/sound/soundblaster/CMakeLists.txt
@@ -5,7 +5,7 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
 
-file(APPEND SOURCE
+list(APPEND SOURCE
     dsp_io.c
     version.c
     speaker.c