Title: [123983] trunk/Source/WebKit2
- Revision
- 123983
- Author
- [email protected]
- Date
- 2012-07-29 14:46:26 -0700 (Sun, 29 Jul 2012)
Log Message
[CMake] Use WEBKIT_CREATE_FORWARDING_HEADERS to generate WK2 forwarding headers
https://bugs.webkit.org/show_bug.cgi?id=83579
Reviewed by Daniel Bates.
Using a list of directories in combination with the WEBKIT_CREATE_FORWARDING_HEADERS
macro allows us to share the common generation of forwarding headers across ports.
* CMakeLists.txt:
* PlatformEfl.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (123982 => 123983)
--- trunk/Source/WebKit2/CMakeLists.txt 2012-07-29 21:02:59 UTC (rev 123982)
+++ trunk/Source/WebKit2/CMakeLists.txt 2012-07-29 21:46:26 UTC (rev 123983)
@@ -98,6 +98,7 @@
"${_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"
@@ -551,8 +552,17 @@
${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)
@@ -572,8 +582,6 @@
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 (123982 => 123983)
--- trunk/Source/WebKit2/ChangeLog 2012-07-29 21:02:59 UTC (rev 123982)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-29 21:46:26 UTC (rev 123983)
@@ -1,3 +1,16 @@
+2012-07-29 Patrick Gansterer <[email protected]>
+
+ [CMake] Use WEBKIT_CREATE_FORWARDING_HEADERS to generate WK2 forwarding headers
+ https://bugs.webkit.org/show_bug.cgi?id=83579
+
+ Reviewed by Daniel Bates.
+
+ Using a list of directories in combination with the WEBKIT_CREATE_FORWARDING_HEADERS
+ macro allows us to share the common generation of forwarding headers across ports.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+
2012-07-28 Sam Weinig <[email protected]>
Stop copying unnecessary files in WebKit2 build
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (123982 => 123983)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2012-07-29 21:02:59 UTC (rev 123982)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2012-07-29 21:46:26 UTC (rev 123983)
@@ -156,6 +156,13 @@
${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
)
@@ -173,16 +180,6 @@
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
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
