Changeset 270652 in webkit for trunk/Source/JavaScriptCore/shell

Timestamp:

Dec 10, 2020, 1:28:18 PM (4 years ago)

Author:

[email protected]

Message:

[CMake] Determine when to use $<TARGET_OBJECTS> for executables
​https://bugs.webkit.org/show_bug.cgi?id=219648

Reviewed by Michael Catanzaro.

.:

When a WebKit framework is declared as an OBJECT library the WebKit::${framework} ALIAS
does not propagate the objects to the executable being built. As a workaround ports will
explicitly add $<TARGET_OBJECTS> to the list of libraries being linked. There is already
enough information to determine when $<TARGET_OBJECTS> is needed so this decision is moved
into the WEBKIT_EXECUTABLE macros.

An additional ${taget_name}_FRAMEWORKS variable is added which specifies the WebKit
frameworks being used. This will link the WebKit::${framework} alias and if necessary the
associated $<TARGET_OBJECTS>.

This functionality will be expanded upon when support for ${target_name}_FRAMEWORKS is
added to WebKit frameworks to support hidden visibility across ports.

• Source/cmake/WebKitMacros.cmake:

Source/JavaScriptCore:

Use ${taget_name}_FRAMEWORKS to specify WebKit frameworks when linking executables.

• CMakeLists.txt:
• shell/CMakeLists.txt:

Source/WebDriver:

Use ${taget_name}_FRAMEWORKS to specify WebKit frameworks when linking executables.
Remove use of $<TARGET_OBJECTS>.

• CMakeLists.txt:
• PlatformPlayStation.cmake:
• PlatformWin.cmake:

Tools:

Use ${taget_name}_FRAMEWORKS to specify WebKit frameworks when linking executables.
Remove use of $<TARGET_OBJECTS>.

• TestWebKitAPI/CMakeLists.txt:
• TestWebKitAPI/PlatformPlayStation.cmake:
• TestWebKitAPI/PlatformWin.cmake:
• WebKitTestRunner/CMakeLists.txt:

File:

• trunk/Source/JavaScriptCore/shell/CMakeLists.txt (modified) (3 diffs)

trunk/Source/JavaScriptCore/shell/CMakeLists.txt

@@ -1 @@
-set(jsc_SOURCES
-    ../jsc.cpp
-)
-
 if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC")
     set(jsc_PRIVATE_DEFINITIONS STATICALLY_LINKED_WITH_JavaScriptCore)
 endif ()
 
-set(jsc_LIBRARIES
-    ${CMAKE_DL_LIBS}
-    WebKit::JavaScriptCore
-)
+set(jsc_SOURCES ../jsc.cpp)
+set(jsc_LIBRARIES ${CMAKE_DL_LIBS})
+set(jsc_FRAMEWORKS JavaScriptCore)
 
 set(jsc_PRIVATE_INCLUDE_DIRECTORIES
@@ -43 +38 @@
     set(testapi_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
     set(testapi_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
-    set(testapi_LIBRARIES WebKit::JavaScriptCore)
+    set(testapi_FRAMEWORKS ${jsc_FRAMEWORKS})
 
     set(testmasm_SOURCES ../assembler/testmasm.cpp)
     set(testmasm_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
     set(testmasm_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
-    set(testmasm_LIBRARIES WebKit::JavaScriptCore)
+    set(testmasm_FRAMEWORKS ${jsc_FRAMEWORKS})
 
     set(testRegExp_SOURCES ../testRegExp.cpp)
     set(testRegExp_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
     set(testRegExp_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
-    set(testRegExp_LIBRARIES WebKit::JavaScriptCore)
+    set(testRegExp_FRAMEWORKS ${jsc_FRAMEWORKS})
 
     set(testb3_SOURCES
@@ -67 +62 @@
     set(testb3_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
     set(testb3_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
-    set(testb3_LIBRARIES WebKit::JavaScriptCore)
+    set(testb3_FRAMEWORKS ${jsc_FRAMEWORKS})
 
     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 WebKit::JavaScriptCore)
+    set(testair_FRAMEWORKS ${jsc_FRAMEWORKS})
 
     set(testdfg_SOURCES ../dfg/testdfg.cpp)
     set(testdfg_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
     set(testdfg_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
-    set(testdfg_LIBRARIES WebKit::JavaScriptCore)
+    set(testdfg_FRAMEWORKS ${jsc_FRAMEWORKS})
 
     WEBKIT_EXECUTABLE_DECLARE(testapi)