[CMake][EFL] Remove unnecessary include, library path in WebKitTestRunner/PlatformEfl...

https://bugs.webkit.org/show_bug.cgi?id=144217

Reviewed by Darin Adler.

* WebKitTestRunner/PlatformEfl.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@183369 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index b95a8fb6db6643453489097d999bf08d4fb09b25..1684c7a2d8e58b85eac61be669743b69572187e2 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2015-04-26  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
+
+        [CMake][EFL] Remove unnecessary include, library path in WebKitTestRunner/PlatformEfl.cmake 
+        https://bugs.webkit.org/show_bug.cgi?id=144217
+
+        Reviewed by Darin Adler.
+
+        * WebKitTestRunner/PlatformEfl.cmake:
+
 2015-04-26  Doug Russell  <d_russell@apple.com>
 
         AX: richer text change notifications (142719)

diff --git a/Tools/WebKitTestRunner/PlatformEfl.cmake b/Tools/WebKitTestRunner/PlatformEfl.cmake
index 0f3c8bcea8c2e0767bb2ce8f6ebd9c6290130e38..d3f9bc6ca46be669d6d0fde3994f8938e3cdedc3 100644 (file)
--- a/Tools/WebKitTestRunner/PlatformEfl.cmake
+++ b/Tools/WebKitTestRunner/PlatformEfl.cmake
@@ -13,23 +13,12 @@ list(APPEND WebKitTestRunner_SOURCES
 )
 
 list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
-    ${DERIVED_SOURCES_WEBCORE_DIR}
-    ${DERIVED_SOURCES_WEBCORE_DIR}/include
     ${DERIVED_SOURCES_WEBKIT2_DIR}/include
-
-    ${WEBKIT2_DIR}/UIProcess/API/C/efl
-
     ${WEBKIT2_DIR}/UIProcess/API/efl
-    "${WTF_DIR}/wtf/gobject"
-    ${WEBCORE_DIR}/platform/network/soup
     ${CAIRO_INCLUDE_DIRS}
+    ${ECORE_INCLUDE_DIRS}
     ${ECORE_EVAS_INCLUDE_DIRS}
     ${ECORE_FILE_INCLUDE_DIRS}
-    ${ECORE_INCLUDE_DIRS}
-    ${EINA_INCLUDE_DIRS}
-    ${EO_INCLUDE_DIRS}
-    ${EVAS_INCLUDE_DIRS}
-    ${GLIB_INCLUDE_DIRS}
 )
 
 list(APPEND WebKitTestRunner_LIBRARIES
@@ -37,18 +26,7 @@ list(APPEND WebKitTestRunner_LIBRARIES
     ${ECORE_LIBRARIES}
     ${ECORE_EVAS_LIBRARIES}
     ${EINA_LIBRARIES}
-    ${EO_LIBRARIES}
     ${EVAS_LIBRARIES}
-    ${OPENGL_LIBRARIES}
-    WTF
-)
-
-list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES
-    ${ATK_LIBRARIES}
-    ${ECORE_LIBRARIES}
-    ${ECORE_FILE_LIBRARIES}
-    ${FONTCONFIG_LIBRARIES}
-    ${GLIB_GOBJECT_LIBRARIES}
 )
 
 if (ENABLE_ECORE_X)
@@ -62,6 +40,15 @@ if (ENABLE_ECORE_X)
     )
 endif ()
 
+if (ENABLE_ACCESSIBILITY)
+    list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
+        ${ATK_INCLUDE_DIRS}
+    )
+    list(APPEND WebKitTestRunner_LIBRARIES
+        ${ATK_LIBRARIES}
+    )
+endif ()
+
 list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
     ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityControllerAtk.cpp
     ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityNotificationHandlerAtk.cpp
@@ -76,13 +63,4 @@ list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
 # FIXME: EFL port needs to have own test font and font configure instead of gtk test font in future
 # FIXME: DOWNLOADED_FONTS_DIR should not hardcode the directory structure.
 add_definitions(-DFONTS_CONF_DIR="${TOOLS_DIR}/WebKitTestRunner/gtk/fonts"
-                -DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/DependenciesEFL/Source/webkitgtk-test-fonts")
-
-if (ENABLE_ACCESSIBILITY)
-    list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
-        ${ATK_INCLUDE_DIRS}
-    )
-    list(APPEND WebKitTestRunner_LIBRARIES
-        ${ATK_LIBRARIES}
-    )
-endif ()
+                -DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/DependenciesEFL/Source/webkitgtk-test-fonts")
\ No newline at end of file