Title: [183369] trunk/Tools
- Revision
- 183369
- Author
- [email protected]
- Date
- 2015-04-26 15:31:12 -0700 (Sun, 26 Apr 2015)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (183368 => 183369)
--- trunk/Tools/ChangeLog 2015-04-26 22:17:11 UTC (rev 183368)
+++ trunk/Tools/ChangeLog 2015-04-26 22:31:12 UTC (rev 183369)
@@ -1,3 +1,12 @@
+2015-04-26 Gyuyoung Kim <[email protected]>
+
+ [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 <[email protected]>
AX: richer text change notifications (142719)
Modified: trunk/Tools/WebKitTestRunner/PlatformEfl.cmake (183368 => 183369)
--- trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2015-04-26 22:17:11 UTC (rev 183368)
+++ trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2015-04-26 22:31:12 UTC (rev 183369)
@@ -13,23 +13,12 @@
)
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,20 +26,9 @@
${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)
list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
${ECORE_X_INCLUDE_DIRS}
@@ -62,6 +40,15 @@
)
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 @@
# 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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
