Changeset 229282 in webkit

Timestamp:

Mar 5, 2018, 5:28:35 AM (7 years ago)

Author:

don.olmstead@sony.com

Message:

[CMake] Split JSC header copying into public and private targets
​https://bugs.webkit.org/show_bug.cgi?id=183251

Reviewed by Konstantin Tokarev.

.:

• Source/cmake/WebKitMacros.cmake:

Source/JavaScriptCore:

• CMakeLists.txt:

Source/ThirdParty:

• gtest/CMakeLists.txt:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/CMakeLists.txt (modified) (2 diffs)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/ThirdParty/ChangeLog (modified) (1 diff)
• Source/ThirdParty/gtest/CMakeLists.txt (modified) (1 diff)
• Source/cmake/WebKitMacros.cmake (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2018-03-05  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Split JSC header copying into public and private targets
+        https://bugs.webkit.org/show_bug.cgi?id=183251
+
+        Reviewed by Konstantin Tokarev.
+
+        * Source/cmake/WebKitMacros.cmake:
+
 2018-03-02  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -254 +254 @@
 )
 target_link_libraries(LLIntOffsetsExtractor WTF)
+add_dependencies(LLIntOffsetsExtractor JavaScriptCoreForwardingHeaders)
 
 # The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
@@ -1174 +1175 @@
 
 WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore
-    FILES ${JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS} ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS}
+    FILES ${JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS}
+    FLATTENED
+)
+
+WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore
+    TARGET_NAME JavaScriptCorePrivateForwardingHeaders
+    FILES ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS}
     DERIVED_SOURCE_DIRECTORIES ${DERIVED_SOURCES_DIR}/JavaScriptCore ${DERIVED_SOURCES_DIR}/JavaScriptCore/inspector
     FLATTENED

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-03-05  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Split JSC header copying into public and private targets
+        https://bugs.webkit.org/show_bug.cgi?id=183251
+
+        Reviewed by Konstantin Tokarev.
+
+        * CMakeLists.txt:
+
 2018-03-04  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/ThirdParty/ChangeLog

@@ +1 @@
+2018-03-05  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Split JSC header copying into public and private targets
+        https://bugs.webkit.org/show_bug.cgi?id=183251
+
+        Reviewed by Konstantin Tokarev.
+
+        * gtest/CMakeLists.txt:
+
 2018-02-06  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/ThirdParty/gtest/CMakeLists.txt

@@ -47 +47 @@
     WTF
 )
-add_dependencies(gtest JavaScriptCoreForwardingHeaders)
+add_dependencies(gtest JavaScriptCorePrivateForwardingHeaders)
 
 if (CMAKE_USE_PTHREADS_INIT)

trunk/Source/cmake/WebKitMacros.cmake

@@ -218 +218 @@
 function(WEBKIT_MAKE_FORWARDING_HEADERS framework)
     set(options FLATTENED)
-    set(oneValueArgs DESTINATION)
+    set(oneValueArgs DESTINATION TARGET_NAME)
     set(multiValueArgs DIRECTORIES EXTRA_DIRECTORIES DERIVED_SOURCE_DIRECTORIES FILES)
     cmake_parse_arguments(opt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -264 +264 @@
         endforeach ()
     endforeach ()
-    add_custom_target(${framework}ForwardingHeaders DEPENDS ${fwd_headers})
-    add_dependencies(${framework} ${framework}ForwardingHeaders)
+    if (opt_TARGET_NAME)
+        set(target_name ${opt_TARGET_NAME})
+    else ()
+        set(target_name ${framework}ForwardingHeaders)
+    endif ()
+    add_custom_target(${target_name} DEPENDS ${fwd_headers})
+    add_dependencies(${framework} ${target_name})
     if (opt_DERIVED_SOURCE_DIRECTORIES)
         set(script ${CMAKE_CURRENT_BINARY_DIR}/makeForwardingHeaders.cmake)