Title: [243729] trunk
- Revision
- 243729
- Author
- [email protected]
- Date
- 2019-04-01 18:08:38 -0700 (Mon, 01 Apr 2019)
Log Message
[CMake] Remove EXTRA_DIRECTORIES parameter of WEBKIT_MAKE_FORWARDING_HEADERS
https://bugs.webkit.org/show_bug.cgi?id=196436
Reviewed by Darin Adler.
The parameter was only for WebCore/ForwardingHeaders which was
removed in Bug 182347.
* Source/cmake/WebKitMacros.cmake: Remove unused EXTRA_DIRECTORIES parameter.
Modified Paths
Diff
Modified: trunk/ChangeLog (243728 => 243729)
--- trunk/ChangeLog 2019-04-02 00:26:08 UTC (rev 243728)
+++ trunk/ChangeLog 2019-04-02 01:08:38 UTC (rev 243729)
@@ -1,3 +1,15 @@
+2019-04-01 Fujii Hironori <[email protected]>
+
+ [CMake] Remove EXTRA_DIRECTORIES parameter of WEBKIT_MAKE_FORWARDING_HEADERS
+ https://bugs.webkit.org/show_bug.cgi?id=196436
+
+ Reviewed by Darin Adler.
+
+ The parameter was only for WebCore/ForwardingHeaders which was
+ removed in Bug 182347.
+
+ * Source/cmake/WebKitMacros.cmake: Remove unused EXTRA_DIRECTORIES parameter.
+
2019-04-01 Stephan Szabo <[email protected]>
[PlayStation] Add initialization for JSC shell for PlayStation port
Modified: trunk/Source/cmake/WebKitMacros.cmake (243728 => 243729)
--- trunk/Source/cmake/WebKitMacros.cmake 2019-04-02 00:26:08 UTC (rev 243728)
+++ trunk/Source/cmake/WebKitMacros.cmake 2019-04-02 01:08:38 UTC (rev 243729)
@@ -236,7 +236,7 @@
function(WEBKIT_MAKE_FORWARDING_HEADERS framework)
set(options FLATTENED)
set(oneValueArgs DESTINATION TARGET_NAME)
- set(multiValueArgs DIRECTORIES EXTRA_DIRECTORIES DERIVED_SOURCE_DIRECTORIES FILES)
+ set(multiValueArgs DIRECTORIES DERIVED_SOURCE_DIRECTORIES FILES)
cmake_parse_arguments(opt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
set(headers ${opt_FILES})
if (opt_DESTINATION)
@@ -266,21 +266,6 @@
)
list(APPEND fwd_headers ${fwd_header})
endforeach ()
- foreach (dir IN LISTS opt_EXTRA_DIRECTORIES)
- set(dir ${CMAKE_CURRENT_SOURCE_DIR}/${dir})
- file(GLOB_RECURSE files RELATIVE ${dir} ${dir}/*.h)
- foreach (header IN LISTS files)
- get_filename_component(header_dir ${header} DIRECTORY)
- file(MAKE_DIRECTORY ${destination}/${header_dir})
- set(fwd_header ${destination}/${header})
- add_custom_command(OUTPUT ${fwd_header}
- COMMAND ${CMAKE_COMMAND} -E copy ${dir}/${header} ${fwd_header}
- MAIN_DEPENDENCY ${dir}/${header}
- VERBATIM
- )
- list(APPEND fwd_headers ${fwd_header})
- endforeach ()
- endforeach ()
if (opt_TARGET_NAME)
set(target_name ${opt_TARGET_NAME})
else ()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
