Title: [124068] trunk/Source/WebKit2
- Revision
- 124068
- Author
- par...@webkit.org
- Date
- 2012-07-30 11:49:49 -0700 (Mon, 30 Jul 2012)
Log Message
Unreviewed, rolling out r123983.
http://trac.webkit.org/changeset/123983
https://bugs.webkit.org/show_bug.cgi?id=92663
EFL build is broken when unit tests are enabled (Requested by
paroga on #webkit).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2012-07-30
* CMakeLists.txt:
* PlatformEfl.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (124067 => 124068)
--- trunk/Source/WebKit2/CMakeLists.txt 2012-07-30 18:49:43 UTC (rev 124067)
+++ trunk/Source/WebKit2/CMakeLists.txt 2012-07-30 18:49:49 UTC (rev 124068)
@@ -98,7 +98,6 @@
"${_javascript_CORE_DIR}/runtime"
"${WTF_DIR}"
"${DERIVED_SOURCES_DIR}"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
"${DERIVED_SOURCES_WEBCORE_DIR}"
"${DERIVED_SOURCES_WEBKIT2_DIR}"
"${DERIVED_SOURCES_WEBKIT2_DIR}/include"
@@ -552,17 +551,8 @@
${WebCore_LIBRARY_NAME}
)
-SET(WebKit2_FORWARDING_HEADERS_DIRECTORIES
- Shared/API/c
- UIProcess/API/C
- UIProcess/API/cpp
- WebProcess/InjectedBundle/API/c
-)
-
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
-WEBKIT_CREATE_FORWARDING_HEADERS(WebKit2 DIRECTORIES ${WebKit2_FORWARDING_HEADERS_DIRECTORIES})
-
# Create _javascript_ C++ code given an IDL input
FOREACH (_file ${WebKit2_MESSAGES_IN_FILES})
GET_FILENAME_COMPONENT (_name ${_file} NAME_WE)
@@ -582,6 +572,8 @@
ADD_LIBRARY(${WebKit2_LIBRARY_NAME} ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES})
ADD_DEPENDENCIES(${WebKit2_LIBRARY_NAME} ${WebCore_LIBRARY_NAME})
+ADD_DEPENDENCIES(${WebKit2_LIBRARY_NAME} ${ForwardingHeaders_NAME})
+ADD_DEPENDENCIES(${WebKit2_LIBRARY_NAME} ${ForwardingNetworkHeaders_NAME})
TARGET_LINK_LIBRARIES(${WebKit2_LIBRARY_NAME} ${WebKit2_LIBRARIES})
SET_TARGET_PROPERTIES(${WebKit2_LIBRARY_NAME} PROPERTIES FOLDER "WebKit")
SET_TARGET_PROPERTIES(${WebKit2_LIBRARY_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
Modified: trunk/Source/WebKit2/ChangeLog (124067 => 124068)
--- trunk/Source/WebKit2/ChangeLog 2012-07-30 18:49:43 UTC (rev 124067)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-30 18:49:49 UTC (rev 124068)
@@ -1,5 +1,17 @@
2012-07-30 Sheriff Bot <webkit.review....@gmail.com>
+ Unreviewed, rolling out r123983.
+ http://trac.webkit.org/changeset/123983
+ https://bugs.webkit.org/show_bug.cgi?id=92663
+
+ EFL build is broken when unit tests are enabled (Requested by
+ paroga on #webkit).
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+
+2012-07-30 Sheriff Bot <webkit.review....@gmail.com>
+
Unreviewed, rolling out r123966 and r123967.
http://trac.webkit.org/changeset/123966
http://trac.webkit.org/changeset/123967
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (124067 => 124068)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2012-07-30 18:49:43 UTC (rev 124067)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2012-07-30 18:49:49 UTC (rev 124068)
@@ -156,13 +156,6 @@
${LIBSOUP24_LIBRARIES}
)
-LIST (APPEND WebKit2_FORWARDING_HEADERS_DIRECTORIES
- Shared/API/c/efl
- Shared/API/c/soup
- UIProcess/API/C/efl
- UIProcess/API/C/soup
-)
-
LIST (APPEND WebProcess_SOURCES
efl/MainEfl.cpp
)
@@ -180,6 +173,16 @@
ADD_DEFINITIONS(-DDEFAULT_THEME_PATH=\"${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/themes\")
+ADD_CUSTOM_TARGET(forwarding-headerEfl
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include efl
+)
+SET(ForwardingHeaders_NAME forwarding-headerEfl)
+
+ADD_CUSTOM_TARGET(forwarding-headerSoup
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
+)
+SET(ForwardingNetworkHeaders_NAME forwarding-headerSoup)
+
CONFIGURE_FILE(efl/ewebkit2.pc.in ${CMAKE_BINARY_DIR}/WebKit2/efl/ewebkit2.pc @ONLY)
SET (EWebKit2_HEADERS
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/EWebKit2.h"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
