[CMake] Remove EXTRA_DIRECTORIES parameter of WEBKIT_MAKE_FORWARDING_HEADERS
authorHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 2 Apr 2019 01:08:38 +0000 (01:08 +0000)
committerHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 2 Apr 2019 01:08:38 +0000 (01:08 +0000)
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.

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

ChangeLog
Source/cmake/WebKitMacros.cmake

index 1a72946..e876514 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2019-04-01  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [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  <stephan.szabo@sony.com>
 
         [PlayStation] Add initialization for JSC shell for PlayStation port
index 6d58d57..1cf0436 100644 (file)
@@ -236,7 +236,7 @@ endmacro()
 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 @@ function(WEBKIT_MAKE_FORWARDING_HEADERS framework)
         )
         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 ()