Changeset 276316 in webkit for trunk/Source/JavaScriptCore/GLib.cmake

Timestamp:

Apr 20, 2021, 1:16:15 PM (4 years ago)

Author:

[email protected]

Message:

[CMake] Don't use FORWARDING_HEADERS_DIR for JSC GLib headers
​https://bugs.webkit.org/show_bug.cgi?id=224821

Reviewed by Michael Catanzaro.

.:

Create CMake variables JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR and
JavaScriptCoreGLib_DERIVED_SOURCES_DIR to represent where the JavaScriptCore GLib headers
and derived sources will reside. The names and locations set then follow along with the
conventions used for the other frameworks.

• Source/cmake/OptionsGTK.cmake:
• Source/cmake/OptionsWPE.cmake:

Source/JavaScriptCore:

Use JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR and JavaScriptCoreGLib_DERIVED_SOURCES_DIR
for GLib JSC headers instead of FORWARDING_HEADERS_DIR and DERIVED_SOURCES_DIR.

• GLib.cmake:
• PlatformGTK.cmake:

Source/WebKit:

Use JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR and JavaScriptCoreGLib_DERIVED_SOURCES_DIR
for GLib JSC headers instead of FORWARDING_HEADERS_DIR and DERIVED_SOURCES_DIR.

• PlatformGTK.cmake:

Tools:

Use JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR and JavaScriptCoreGLib_DERIVED_SOURCES_DIR
for GLib JSC headers instead of FORWARDING_HEADERS_DIR and DERIVED_SOURCES_DIR.

• MiniBrowser/wpe/CMakeLists.txt:
• TestWebKitAPI/glib/CMakeLists.txt:
• TestWebKitAPI/glib/PlatformWPE.cmake:

File:

• trunk/Source/JavaScriptCore/GLib.cmake (modified) (3 diffs)

trunk/Source/JavaScriptCore/GLib.cmake

@@ -1 @@
-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib)
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}/jsc)
+file(MAKE_DIRECTORY ${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR})
+file(MAKE_DIRECTORY ${JavaScriptCoreGLib_DERIVED_SOURCES_DIR}/jsc)
 
 list(APPEND JavaScriptCore_SOURCES
@@ -18 +18 @@
 
 list(APPEND JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES
-    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib"
-    "${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}/jsc"
     "${JAVASCRIPTCORE_DIR}/API/glib"
+    "${JavaScriptCoreGLib_DERIVED_SOURCES_DIR}/jsc"
+    "${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}"
 )
 
 list(APPEND JavaScriptCore_INTERFACE_INCLUDE_DIRECTORIES
-    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib"
-    "${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}"
+    "${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}"
+    "${JavaScriptCoreGLib_DERIVED_SOURCES_DIR}"
 )
 
 set(JavaScriptCore_INSTALLED_HEADERS
-    ${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}/jsc/JSCVersion.h
     ${JAVASCRIPTCORE_DIR}/API/glib/JSCAutocleanups.h
     ${JAVASCRIPTCORE_DIR}/API/glib/JSCClass.h
@@ -40 +39 @@
     ${JAVASCRIPTCORE_DIR}/API/glib/JSCWeakValue.h
     ${JAVASCRIPTCORE_DIR}/API/glib/jsc.h
+
+    ${JavaScriptCoreGLib_DERIVED_SOURCES_DIR}/jsc/JSCVersion.h
 )
 
-configure_file(API/glib/JSCVersion.h.in ${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}/jsc/JSCVersion.h)
+configure_file(API/glib/JSCVersion.h.in ${JavaScriptCoreGLib_DERIVED_SOURCES_DIR}/jsc/JSCVersion.h)
 
 # These symbolic link allows includes like #include <jsc/jsc.h> which simulates installed headers.
 add_custom_command(
-    OUTPUT ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib/jsc
+    OUTPUT ${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}/jsc
     DEPENDS ${JAVASCRIPTCORE_DIR}/API/glib
-    COMMAND ln -n -s -f ${JAVASCRIPTCORE_DIR}/API/glib ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib/jsc
+    COMMAND ln -n -s -f ${JAVASCRIPTCORE_DIR}/API/glib ${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}/jsc
     VERBATIM
 )
 add_custom_target(JSC-fake-api-headers
-    DEPENDS ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib/jsc
+    DEPENDS ${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}/jsc
 )
 set(JavaScriptCore_EXTRA_DEPENDENCIES