[CMake] Add WebKit::JavaScriptCore target
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Jun 2019 17:04:35 +0000 (17:04 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Jun 2019 17:04:35 +0000 (17:04 +0000)
https://bugs.webkit.org/show_bug.cgi?id=198403

Reviewed by Konstantin Tokarev.

Source/JavaScriptCore:

Create the WebKit::JavaScriptCore target and use that to propagate headers. Use
WEBKIT_COPY_FILES instead of WEBKIT_MAKE_FORWARDING_HEADERS.

* CMakeLists.txt:
* shell/CMakeLists.txt:

Source/WebCore:

Use the WebKit::JavaScriptCore target.

* CMakeLists.txt:

Source/WebCore/PAL:

Use the WebKit::JavaScriptCore target.

* pal/CMakeLists.txt:

Source/WebKitLegacy:

Use the WebKit::JavaScriptCore target.

* CMakeLists.txt:

Tools:

Use the WebKit::JavaScriptCore target.

* DumpRenderTree/CMakeLists.txt:
* MiniBrowser/win/CMakeLists.txt:
* TestWebKitAPI/CMakeLists.txt:
* TestWebKitAPI/PlatformGTK.cmake:
* TestWebKitAPI/PlatformWPE.cmake:
* TestWebKitAPI/glib/CMakeLists.txt:
* WebKitTestRunner/CMakeLists.txt:

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

17 files changed:
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/shell/CMakeLists.txt
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/pal/CMakeLists.txt
Source/WebKitLegacy/CMakeLists.txt
Source/WebKitLegacy/ChangeLog
Tools/ChangeLog
Tools/DumpRenderTree/CMakeLists.txt
Tools/MiniBrowser/win/CMakeLists.txt
Tools/TestWebKitAPI/CMakeLists.txt
Tools/TestWebKitAPI/PlatformGTK.cmake
Tools/TestWebKitAPI/PlatformWPE.cmake
Tools/TestWebKitAPI/glib/CMakeLists.txt
Tools/WebKitTestRunner/CMakeLists.txt

index 9415ea0..9c97474 100644 (file)
@@ -290,9 +290,9 @@ add_executable(LLIntOffsetsExtractor
 )
 
 target_link_libraries(LLIntSettingsExtractor WebKit::WTF)
-add_dependencies(LLIntSettingsExtractor JavaScriptCoreFrameworkHeaders)
+add_dependencies(LLIntSettingsExtractor JavaScriptCore_CopyHeaders)
 target_link_libraries(LLIntOffsetsExtractor WebKit::WTF)
-add_dependencies(LLIntOffsetsExtractor JavaScriptCoreFrameworkHeaders)
+add_dependencies(LLIntOffsetsExtractor JavaScriptCore_CopyHeaders)
 
 # The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
 # LLIntAssembly.h's mtime. The problem we have here is: asm.rb has some built-in optimization
@@ -1262,6 +1262,16 @@ if (WTF_CPU_X86_64)
     endif ()
 endif ()
 
+set(JavaScriptCore_INTERFACE_LIBRARIES JavaScriptCore)
+set(JavaScriptCore_INTERFACE_INCLUDE_DIRECTORIES
+    ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}
+    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
+)
+set(JavaScriptCore_INTERFACE_DEPENDENCIES
+    JavaScriptCore_CopyHeaders
+    JavaScriptCore_CopyPrivateHeaders
+)
+
 WEBKIT_FRAMEWORK_DECLARE(JavaScriptCore)
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
@@ -1271,15 +1281,13 @@ if (COMPILER_IS_GCC_OR_CLANG)
     WEBKIT_ADD_TARGET_CXX_FLAGS(JavaScriptCore -ffp-contract=off)
 endif ()
 
-WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore
-    TARGET_NAME JavaScriptCoreFrameworkHeaders
+WEBKIT_COPY_FILES(JavaScriptCore_CopyHeaders
     DESTINATION ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}/JavaScriptCore
     FILES ${JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS}
     FLATTENED
 )
 
-WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore
-    TARGET_NAME JavaScriptCorePrivateFrameworkHeaders
+WEBKIT_COPY_FILES(JavaScriptCore_CopyPrivateHeaders
     DESTINATION ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/JavaScriptCore
     FILES ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS}
     FLATTENED
@@ -1302,6 +1310,7 @@ add_subdirectory(shell)
 WEBKIT_COMPUTE_SOURCES(JavaScriptCore)
 WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
 WEBKIT_FRAMEWORK(JavaScriptCore)
+WEBKIT_FRAMEWORK_TARGET(JavaScriptCore)
 
 if (NOT "${PORT}" STREQUAL "Mac")
     if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "SHARED")
index 12cd2c1..312079d 100644 (file)
@@ -1,3 +1,16 @@
+2019-06-03  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Add WebKit::JavaScriptCore target
+        https://bugs.webkit.org/show_bug.cgi?id=198403
+
+        Reviewed by Konstantin Tokarev.
+
+        Create the WebKit::JavaScriptCore target and use that to propagate headers. Use
+        WEBKIT_COPY_FILES instead of WEBKIT_MAKE_FORWARDING_HEADERS.
+
+        * CMakeLists.txt:
+        * shell/CMakeLists.txt:
+
 2019-06-03  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r246022.
index 7acfa89..9a49a33 100644 (file)
@@ -8,13 +8,12 @@ endif ()
 
 set(jsc_LIBRARIES
     ${CMAKE_DL_LIBS}
-    JavaScriptCore
+    WebKit::JavaScriptCore
 )
 
 set(jsc_PRIVATE_INCLUDE_DIRECTORIES
     ${JavaScriptCore_INCLUDE_DIRECTORIES}
     ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES}
-    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
     ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}
 )
 
@@ -41,32 +40,32 @@ if (DEVELOPER_MODE)
     )
     set(testapi_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
     set(testapi_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
-    set(testapi_LIBRARIES JavaScriptCore)
+    set(testapi_LIBRARIES WebKit::JavaScriptCore)
 
     set(testmasm_SOURCES ../assembler/testmasm.cpp)
     set(testmasm_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
     set(testmasm_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
-    set(testmasm_LIBRARIES JavaScriptCore)
+    set(testmasm_LIBRARIES WebKit::JavaScriptCore)
 
     set(testRegExp_SOURCES ../testRegExp.cpp)
     set(testRegExp_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
     set(testRegExp_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
-    set(testRegExp_LIBRARIES JavaScriptCore)
+    set(testRegExp_LIBRARIES WebKit::JavaScriptCore)
 
     set(testb3_SOURCES ../b3/testb3.cpp)
     set(testb3_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
     set(testb3_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
-    set(testb3_LIBRARIES JavaScriptCore)
+    set(testb3_LIBRARIES WebKit::JavaScriptCore)
 
     set(testair_SOURCES ../b3/air/testair.cpp)
     set(testair_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
     set(testair_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
-    set(testair_LIBRARIES JavaScriptCore)
+    set(testair_LIBRARIES WebKit::JavaScriptCore)
 
     set(testdfg_SOURCES ../dfg/testdfg.cpp)
     set(testdfg_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
     set(testdfg_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
-    set(testdfg_LIBRARIES JavaScriptCore)
+    set(testdfg_LIBRARIES WebKit::JavaScriptCore)
 
     WEBKIT_EXECUTABLE_DECLARE(testapi)
     WEBKIT_EXECUTABLE_DECLARE(testRegExp)
index 0b0fdf8..071ad20 100644 (file)
@@ -17,7 +17,6 @@ list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
 )
 
 set(WebCore_INCLUDE_DIRECTORIES
-    "${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
     "${PAL_FRAMEWORK_HEADERS_DIR}"
 )
 
@@ -1204,7 +1203,7 @@ set(WebCore_LIBRARIES
 )
 
 set(WebCoreTestSupport_LIBRARIES
-    JavaScriptCore${DEBUG_SUFFIX}
+    WebKit::JavaScriptCore
 )
 
 if (ENABLE_LEGACY_ENCRYPTED_MEDIA)
index 2ef15e2..ce55f4d 100644 (file)
@@ -1,3 +1,14 @@
+2019-06-03  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Add WebKit::JavaScriptCore target
+        https://bugs.webkit.org/show_bug.cgi?id=198403
+
+        Reviewed by Konstantin Tokarev.
+
+        Use the WebKit::JavaScriptCore target.
+
+        * CMakeLists.txt:
+
 2019-06-03  Zan Dobersek  <zdobersek@igalia.com>
 
         [Nicosia] Disable async scrolling until implemented
index e4a5974..c3c5dd6 100644 (file)
@@ -1,3 +1,14 @@
+2019-06-03  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Add WebKit::JavaScriptCore target
+        https://bugs.webkit.org/show_bug.cgi?id=198403
+
+        Reviewed by Konstantin Tokarev.
+
+        Use the WebKit::JavaScriptCore target.
+
+        * pal/CMakeLists.txt:
+
 2019-05-29  Don Olmstead  <don.olmstead@sony.com>
 
         Remove ENABLE definitions from WebKit config files
index fc0091e..1d07233 100644 (file)
@@ -38,7 +38,7 @@ set(PAL_PRIVATE_INCLUDE_DIRECTORIES
 )
 
 set(PAL_LIBRARIES
-    JavaScriptCore${DEBUG_SUFFIX}
+    WebKit::JavaScriptCore
 )
 
 WEBKIT_FRAMEWORK_DECLARE(PAL)
index 960a970..8268180 100644 (file)
@@ -26,7 +26,7 @@ set(WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
 )
 
 set(WebKitLegacy_LIBRARIES
-    PRIVATE JavaScriptCore${DEBUG_SUFFIX}
+    PRIVATE WebKit::JavaScriptCore
     PRIVATE WebCore${DEBUG_SUFFIX}
     PRIVATE PAL${DEBUG_SUFFIX}
 )
index 600ee0c..ec9d4a3 100644 (file)
@@ -1,3 +1,14 @@
+2019-06-03  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Add WebKit::JavaScriptCore target
+        https://bugs.webkit.org/show_bug.cgi?id=198403
+
+        Reviewed by Konstantin Tokarev.
+
+        Use the WebKit::JavaScriptCore target.
+
+        * CMakeLists.txt:
+
 2019-05-31  Don Olmstead  <don.olmstead@sony.com>
 
         [CMake] Add WebKit::WTF target
index d7a6e3d..b2854a6 100644 (file)
@@ -1,3 +1,20 @@
+2019-06-03  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Add WebKit::JavaScriptCore target
+        https://bugs.webkit.org/show_bug.cgi?id=198403
+
+        Reviewed by Konstantin Tokarev.
+
+        Use the WebKit::JavaScriptCore target.
+
+        * DumpRenderTree/CMakeLists.txt:
+        * MiniBrowser/win/CMakeLists.txt:
+        * TestWebKitAPI/CMakeLists.txt:
+        * TestWebKitAPI/PlatformGTK.cmake:
+        * TestWebKitAPI/PlatformWPE.cmake:
+        * TestWebKitAPI/glib/CMakeLists.txt:
+        * WebKitTestRunner/CMakeLists.txt:
+
 2019-06-03  Darin Adler  <darin@apple.com>
 
         Finish cleanup of String::number for floating point
index d61cbf4..f579f4e 100644 (file)
@@ -23,7 +23,7 @@ set(DumpRenderTree_SOURCES
 
 set(DumpRenderTree_LIBRARIES
     WebCoreTestSupport
-    JavaScriptCore
+    WebKit::JavaScriptCore
 )
 
 set(DumpRenderTree_INCLUDE_DIRECTORIES
@@ -67,7 +67,7 @@ set(TestNetscapePlugIn_SOURCES
 )
 
 set(TestNetscapePlugIn_LIBRARIES
-    JavaScriptCore
+    WebKit::JavaScriptCore
     WebCoreTestSupport
 )
 
index 30b73df..b4d5402 100644 (file)
@@ -1,6 +1,4 @@
 set(MiniBrowser_INCLUDE_DIRECTORIES
-    ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}
-    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
     ${PAL_FRAMEWORK_HEADERS_DIR}
     ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
     ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
index bdaca49..c49d97a 100644 (file)
@@ -245,8 +245,6 @@ if (ENABLE_WEBKIT)
         ${TESTWEBKITAPI_DIR}
         ${THIRDPARTY_DIR}/gtest/include
         ${PAL_FRAMEWORK_HEADERS_DIR}
-        ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
-        ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}
         ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
         ${WebKit_FRAMEWORK_HEADERS_DIR}
     )
index 821f363..ba90917 100644 (file)
@@ -105,7 +105,6 @@ set(TestJSC_PRIVATE_INCLUDE_DIRECTORIES
     ${GLIB_INCLUDE_DIRS}
     ${GTK3_INCLUDE_DIRS}
     ${THIRDPARTY_DIR}/gtest/include
-    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
     ${FORWARDING_HEADERS_DIR}
     ${FORWARDING_HEADERS_DIR}/JavaScriptCore
     ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib
@@ -115,7 +114,7 @@ set(TestJSC_PRIVATE_INCLUDE_DIRECTORIES
 set(TestJSC_LIBRARIES
     ${GLIB_LIBRARIES}
     ${GLIB_GMODULE_LIBRARIES}
-    JavaScriptCore
+    WebKit::JavaScriptCore
 )
 
 set(TestJSC_DEFINITIONS
index 7c676ba..54413ef 100644 (file)
@@ -100,7 +100,6 @@ set(TestJSC_PRIVATE_INCLUDE_DIRECTORIES
     ${CMAKE_BINARY_DIR}
     ${TESTWEBKITAPI_DIR}
     ${THIRDPARTY_DIR}/gtest/include
-    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
     ${FORWARDING_HEADERS_DIR}
     ${FORWARDING_HEADERS_DIR}/JavaScriptCore
     ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib
@@ -110,7 +109,7 @@ set(TestJSC_PRIVATE_INCLUDE_DIRECTORIES
 set(TestJSC_LIBRARIES
     ${GLIB_LIBRARIES}
     ${GLIB_GMODULE_LIBRARIES}
-    JavaScriptCore
+    WebKit::JavaScriptCore
 )
 
 set(TestJSC_DEFINITIONS
index 2a743a7..6f1d5a0 100644 (file)
@@ -22,7 +22,7 @@ set(WebKitGLibAPITests_SYSTEM_INCLUDE_DIRECTORIES
 )
 
 set(WebKitAPITest_LIBRARIES
-    JavaScriptCore
+    WebKit::JavaScriptCore
     WebKit
 )
 
@@ -34,7 +34,7 @@ set(WebKitGLibAPITest_LIBRARIES
 )
 
 set(WebKitGLibAPITestExtension_LIBRARIES
-    JavaScriptCore
+    WebKit::JavaScriptCore
     WebKit
     ${GLIB_LIBRARIES}
 )
index 632aa0b..b2335b2 100644 (file)
@@ -23,7 +23,7 @@ set(WebKitTestRunner_SOURCES
 )
 
 set(WebKitTestRunner_LIBRARIES
-    JavaScriptCore
+    WebKit::JavaScriptCore
     WebCoreTestSupport
     WebKit
 )