1 files changed, 30 insertions, 7 deletions
diff --git a/WebCore/CMakeListsEfl.txt b/WebCore/CMakeListsEfl.txt
index 18fedc3..789cfdc 100644
--- a/WebCore/CMakeListsEfl.txt
+++ b/WebCore/CMakeListsEfl.txt
@@ -69,11 +69,7 @@ IF (WTF_PLATFORM_CAIRO)
   LIST(APPEND WebCore_SOURCES
     platform/graphics/cairo/CairoUtilities.cpp
     platform/graphics/cairo/ContextShadowCairo.cpp
-    platform/graphics/cairo/FontCacheFreeType.cpp
     platform/graphics/cairo/FontCairo.cpp
-    platform/graphics/cairo/FontCustomPlatformData.cpp
-    platform/graphics/cairo/FontPlatformDataFreeType.cpp
-    platform/graphics/cairo/GlyphPageTreeNodeCairo.cpp
     platform/graphics/cairo/GradientCairo.cpp
     platform/graphics/cairo/GraphicsContextCairo.cpp
     platform/graphics/cairo/ImageBufferCairo.cpp
@@ -82,11 +78,40 @@ IF (WTF_PLATFORM_CAIRO)
     platform/graphics/cairo/PathCairo.cpp
     platform/graphics/cairo/PatternCairo.cpp
     platform/graphics/cairo/RefPtrCairo.cpp
-    platform/graphics/cairo/SimpleFontDataCairo.cpp
     platform/graphics/cairo/TransformationMatrixCairo.cpp
 
     platform/image-decoders/cairo/ImageDecoderCairo.cpp
   )
+
+  IF (WTF_USE_FREETYPE)
+    LIST(APPEND WebCore_INCLUDE_DIRECTORIES
+      "${WEBCORE_DIR}/platform/graphics/freetype"
+    )
+    LIST(APPEND WebCore_SOURCES
+      platform/graphics/freetype/FontCacheFreeType.cpp
+      platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
+      platform/graphics/freetype/FontPlatformDataFreeType.cpp
+      platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp
+      platform/graphics/freetype/SimpleFontDataFreeType.cpp
+    )
+  ENDIF ()
+
+  IF (WTF_USE_PANGO)
+    LIST(APPEND WebCore_INCLUDE_DIRECTORIES
+      "${WEBCORE_DIR}/platform/graphics/pango"
+      ${Pango_INCLUDE_DIRS}
+    )
+    LIST(APPEND WebCore_SOURCES
+      platform/graphics/pango/FontCachePango.cpp
+      platform/graphics/pango/FontCustomPlatformDataPango.cpp
+      platform/graphics/pango/FontPlatformDataPango.cpp
+      platform/graphics/pango/GlyphPageTreeNodePango.cpp
+      platform/graphics/pango/SimpleFontDataPango.cpp
+    )
+    LIST(APPEND WebCore_LIBRARIES
+      ${Pango_LIBRARIES}
+    )
+  ENDIF ()
 ENDIF ()
 
 IF (WTF_USE_SOUP)
@@ -164,7 +189,6 @@ LIST(APPEND WebCore_LIBRARIES
   ${ICU_LIBRARIES}
   ${LIBXML2_LIBRARIES}
   ${LIBXSLT_LIBRARIES}
-  ${Pango_LIBRARIES}
   ${SQLITE_LIBRARIES}
 )
 
@@ -198,7 +222,6 @@ LIST(APPEND WebCore_INCLUDE_DIRECTORIES
   ${ICU_INCLUDE_DIRS}
   ${LIBXML2_INCLUDE_DIR}
   ${LIBXSLT_INCLUDE_DIRS}
-  ${Pango_INCLUDE_DIRS}
   ${SQLITE_INCLUDE_DIRS}
 )