ChangeLog

2019-04-08  Don Olmstead  <don.olmstead@sony.com>

        [CMake][WinCairo] Separate copied headers into different directories

        https://bugs.webkit.org/show_bug.cgi?id=196655

        Reviewed by NOBODY (OOPS!).

        Add variables for the paths to copied framework headers. This is done to be

        explicit rather than relying on ${FORWARDING_HEADERS_DIR}.

        Currently all ports but WinCairo will default to ${FORWARDING_HEADERS_DIR}.

        WinCairo overrides them to provide a directory structure that looks more

        like what happens in an XCode build. This is meant as an intermediate step

        towards making all CMake ports behave like this.

        * Source/cmake/OptionsWinCairo.cmake:

        * Source/cmake/WebKitFS.cmake:

        * Source/cmake/WebKitMacros.cmake:

2019-04-08  Xan Lopez  <xan@igalia.com>

        [CMake] Detect SSE2 at compile time

Source/JavaScriptCore/CMakeLists.txt

@@list(APPEND JavaScriptCore_UNIFIED_SOURCE_LIST_FILES

)

set(JavaScriptCore_INCLUDE_DIRECTORIES

10 "${FORWARDING_HEADERS_DIR}"

10 "${WTF_FRAMEWORK_HEADERS_DIR}"

11 "${JavaScriptCore_FRAMEWORK_HEADERS_DIR}"

)

set(JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES

@@add_executable(LLIntOffsetsExtractor

)

target_link_libraries(LLIntSettingsExtractor WTF)

303 add_dependencies(LLIntSettingsExtractor JavaScriptCoreF~~orwarding~~Headers)

304add_dependencies(LLIntSettingsExtractor JavaScriptCoreFrameworkHeaders)

304305target_link_libraries(LLIntOffsetsExtractor WTF)

305 add_dependencies(LLIntOffsetsExtractor JavaScriptCoreF~~orwarding~~Headers)

306add_dependencies(LLIntOffsetsExtractor JavaScriptCoreFrameworkHeaders)

# 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

@@if (COMPILER_IS_GCC_OR_CLANG)

endif ()

WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore

1278 TARGET_NAME JavaScriptCoreFrameworkHeaders

1279 DESTINATION ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}/JavaScriptCore

    FILES ${JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS}

    FLATTENED

)

WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore

1282 TARGET_NAME JavaScriptCorePrivateForwardingHeaders

1285 TARGET_NAME JavaScriptCorePrivateFrameworkHeaders

1286 DESTINATION ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/JavaScriptCore

    FILES ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS}

    FLATTENED

)

Source/JavaScriptCore/ChangeLog

2019-04-08  Don Olmstead  <don.olmstead@sony.com>

        [CMake][WinCairo] Separate copied headers into different directories

        https://bugs.webkit.org/show_bug.cgi?id=196655

        Reviewed by NOBODY (OOPS!).

        * CMakeLists.txt:

        * shell/PlatformWin.cmake:

2019-04-08  Justin Fan  <justin_fan@apple.com>

        [Web GPU] Fix Web GPU experimental feature on iOS

Source/JavaScriptCore/shell/PlatformWin.cmake

1 include_directories(./ PRIVATE ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES})

1include_directories(./ PRIVATE ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR})

include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})

add_library(jscLib SHARED ${JSC_SOURCES})

Source/WTF/ChangeLog

2019-04-08  Don Olmstead  <don.olmstead@sony.com>

        [CMake][WinCairo] Separate copied headers into different directories

        https://bugs.webkit.org/show_bug.cgi?id=196655

        Reviewed by NOBODY (OOPS!).

        * wtf/CMakeLists.txt:

2019-04-08  Guillaume Emont  <guijemont@igalia.com>

        Enable DFG on MIPS

Source/WTF/wtf/CMakeLists.txt

@@WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})

WEBKIT_FRAMEWORK(WTF)

WEBKIT_MAKE_FORWARDING_HEADERS(WTF

505 DESTINATION ${FORWARDING_HEADERS_DIR}/wtf

505 TARGET_NAME WTFFrameworkHeaders

506 DESTINATION ${WTF_FRAMEWORK_HEADERS_DIR}/wtf

    FILES ${WTF_PUBLIC_HEADERS}

)

Source/WebCore/CMakeLists.txt

@@list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES

set(WebCore_INCLUDE_DIRECTORIES

    "${CMAKE_BINARY_DIR}"

20 "${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"

21 "${PAL_FRAMEWORK_HEADERS_DIR}"

    "${WEBCORE_DIR}"

    "${WEBCORE_DIR}/Modules/airplay"

    "${WEBCORE_DIR}/Modules/applepay"

Source/WebCore/ChangeLog

2019-04-08  Don Olmstead  <don.olmstead@sony.com>

        [CMake][WinCairo] Separate copied headers into different directories

        https://bugs.webkit.org/show_bug.cgi?id=196655

        Reviewed by NOBODY (OOPS!).

        * CMakeLists.txt:

        * PlatformWin.cmake:

2019-04-08  Yusuke Suzuki  <ysuzuki@apple.com>

        Unreviewed, speculative fix for build failure in old macOS after r243887

Source/WebCore/PAL/ChangeLog

2019-04-08  Don Olmstead  <don.olmstead@sony.com>

        [CMake][WinCairo] Separate copied headers into different directories

        https://bugs.webkit.org/show_bug.cgi?id=196655

        Reviewed by NOBODY (OOPS!).

        * pal/CMakeLists.txt:

2019-04-08  Justin Fan  <justin_fan@apple.com>

        [Web GPU] Fix Web GPU experimental feature on iOS

Source/WebCore/PAL/pal/CMakeLists.txt

@@WEBKIT_WRAP_SOURCELIST(${PAL_SOURCES})

WEBKIT_FRAMEWORK(PAL)

WEBKIT_MAKE_FORWARDING_HEADERS(PAL

53 DESTINATION ${FORWARDING_HEADERS_DIR}/pal

53 TARGET_NAME PALFrameworkHeaders

54 DESTINATION ${PAL_FRAMEWORK_HEADERS_DIR}/pal

5455 FILES ${PAL_PUBLIC_HEADERS}

5556)

Source/WebCore/PlatformWin.cmake

@@set(WebCore_PRIVATE_FRAMEWORK_HEADERS

)

WEBKIT_MAKE_FORWARDING_HEADERS(WebCore

357 TARGET_NAME WebCorePrivateFrameworkHeaders

358 DESTINATION ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/WebCore

    FILES ${WebCore_PRIVATE_FRAMEWORK_HEADERS}

    DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES}

    FLATTENED

)

362 add_dependencies(WebCoreF~~orwarding~~Headers WebCoreBindings)

364add_dependencies(WebCorePrivateFrameworkHeaders WebCoreBindings)

set(WebCore_OUTPUT_NAME

    WebCore${DEBUG_SUFFIX}

Source/WebKit/CMakeLists.txt

@@include(WebKitCommon)

set_property(DIRECTORY . PROPERTY FOLDER "WebKit")

set(WebKit_INCLUDE_DIRECTORIES

6 "${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"

7 "${WebKit_FRAMEWORK_HEADERS_DIR}"

    "${WEBKIT_DIR}"

    "${WEBKIT_DIR}/NetworkProcess"

    "${WEBKIT_DIR}/NetworkProcess/Classifier"

Source/WebKit/ChangeLog

2019-04-08  Don Olmstead  <don.olmstead@sony.com>

        [CMake][WinCairo] Separate copied headers into different directories

        https://bugs.webkit.org/show_bug.cgi?id=196655

        Reviewed by NOBODY (OOPS!).

        * CMakeLists.txt:

        * PlatformWin.cmake:

2019-04-08  Justin Fan  <justin_fan@apple.com>

        [Web GPU] Fix Web GPU experimental feature on iOS

Source/WebKit/PlatformWin.cmake

@@if (${WTF_PLATFORM_WIN_CAIRO})

endif ()

WEBKIT_MAKE_FORWARDING_HEADERS(WebKit

220 TARGET_NAME WebKitFrameworkHeaders

221 DESTINATION ${WebKit_FRAMEWORK_HEADERS_DIR}/WebKit

    DIRECTORIES ${WebKit_FORWARDING_HEADERS_DIRECTORIES}

    FLATTENED

)

Source/WebKitLegacy/CMakeLists.txt

@@set(WebKitLegacy_INCLUDE_DIRECTORIES

    "${CMAKE_BINARY_DIR}"

    "${WEBKITLEGACY_DIR}/Storage"

    "${WEBKITLEGACY_DIR}/WebCoreSupport"

24 "${F~~ORWARDING~~_HEADERS_DIR}"

24 "${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"

)

set(WebKitLegacy_SYSTEM_INCLUDE_DIRECTORIES

Source/WebKitLegacy/ChangeLog

2019-04-08  Don Olmstead  <don.olmstead@sony.com>

        [CMake][WinCairo] Separate copied headers into different directories

        https://bugs.webkit.org/show_bug.cgi?id=196655

        Reviewed by NOBODY (OOPS!).

        * CMakeLists.txt:

        * PlatformWin.cmake:

2019-04-05  Commit Queue  <commit-queue@webkit.org>

        Unreviewed, rolling out r243833.

Source/WebKitLegacy/PlatformWin.cmake

@@set(WebKitLegacyGUID_PRIVATE_FRAMEWORK_HEADERS

)

WEBKIT_MAKE_FORWARDING_HEADERS(WebKitLegacyGUID

489 DESTINATION ${FORWARDING_HEADERS_DIR}/WebKitLegacy

489 TARGET_NAME WebKitLegacyFrameworkHeaders

490 DESTINATION ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}/WebKitLegacy

    FILES ${WebKitLegacyGUID_PRIVATE_FRAMEWORK_HEADERS}

    FLATTENED

)

Source/cmake/OptionsWinCairo.cmake

@@set(COREFOUNDATION_LIBRARY CFlite)

SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})

add_definitions(-DWTF_PLATFORM_WIN_CAIRO=1)

# Override headers directories

set(WTF_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WTF/Headers)

set(JavaScriptCore_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/JavaScriptCore/Headers)

set(JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/JavaScriptCore/PrivateHeaders)

set(PAL_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/PAL/Headers)

set(WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebCore/PrivateHeaders)

set(WebKitLegacy_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebKitLegacy/Headers)

set(WebKit_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebKit/Headers)

set(WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebKit/PrivateHeaders)

Source/cmake/WebKitFS.cmake

@@set(DERIVED_SOURCES_WTF_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")

set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)

set(WTF_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})

set(JavaScriptCore_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})

set(JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})

set(PAL_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})

set(WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})

set(WebKitLegacy_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})

set(WebKit_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})

set(WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})

file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})

file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime)

Source/cmake/WebKitMacros.cmake

@@function(WEBKIT_MAKE_FORWARDING_HEADERS framework)

    set(multiValueArgs DIRECTORIES FILES)

    cmake_parse_arguments(opt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})

    set(headers ${opt_FILES})

    if (opt_DESTINATION)

        set(destination ${opt_DESTINATION})

    else ()

        set(destination ${FORWARDING_HEADERS_DIR}/${framework})

    endif ()

    file(MAKE_DIRECTORY ${destination})

242 file(MAKE_DIRECTORY ${opt_DESTINATION})

    foreach (dir IN LISTS opt_DIRECTORIES)

        file(GLOB files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${dir}/*.h)

        list(APPEND headers ${files})

@@function(WEBKIT_MAKE_FORWARDING_HEADERS framework)

        endif ()

        if (opt_FLATTENED)

            get_filename_component(header_filename ${header} NAME)

261 set(fwd_header ${~~destination~~}/${header_filename})

256 set(fwd_header ${opt_DESTINATION}/${header_filename})

262257 else ()

263258 get_filename_component(header_dir ${header} DIRECTORY)

264 file(MAKE_DIRECTORY ${~~destination~~}/${header_dir})

265 set(fwd_header ${~~destination~~}/${header})

259 file(MAKE_DIRECTORY ${opt_DESTINATION}/${header_dir})

260 set(fwd_header ${opt_DESTINATION}/${header})

        endif ()

        add_custom_command(OUTPUT ${fwd_header}

            COMMAND ${CMAKE_COMMAND} -E copy ${src_header} ${fwd_header}

Tools/ChangeLog

2019-04-08  Don Olmstead  <don.olmstead@sony.com>

        [CMake][WinCairo] Separate copied headers into different directories

        https://bugs.webkit.org/show_bug.cgi?id=196655

        Reviewed by NOBODY (OOPS!).

        * DumpRenderTree/CMakeLists.txt:

        * MiniBrowser/win/CMakeLists.txt:

        * TestWebKitAPI/CMakeLists.txt:

        * TestWebKitAPI/PlatformWin.cmake:

2019-04-08  Justin Fan  <justin_fan@apple.com>

        [Web GPU] Fix Web GPU experimental feature on iOS

Tools/DumpRenderTree/CMakeLists.txt

@@set(DumpRenderTree_LIBRARIES

)

set(DumpRenderTree_INCLUDE_DIRECTORIES

30 ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}

    ${DERIVED_SOURCES_DIR}/DumpRenderTree

    ${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}

    ${WEBKIT_TESTRUNNER_SHARED_DIR}/Bindings

Tools/MiniBrowser/win/CMakeLists.txt

11set(MiniBrowser_INCLUDE_DIRECTORIES

    "${FORWARDING_HEADERS_DIR}"

    "${FORWARDING_HEADERS_DIR}/WebKitLegacy"

    "${CMAKE_SOURCE_DIR}"

    "${CMAKE_SOURCE_DIR}/Source"

    ${WTF_FRAMEWORK_HEADERS_DIR}

    ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}

    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}

    ${PAL_FRAMEWORK_HEADERS_DIR}

    ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}

    ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}

    ${WebKit_FRAMEWORK_HEADERS_DIR}

    ${WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR}

)

set(MiniBrowser_SOURCES

Tools/TestWebKitAPI/CMakeLists.txt

@@set(TestWebKitAPI_LIBRARIES

)

set(TestWebKitAPI_DEPENDENCIES

    JavaScriptCoreForwardingHeaders

    JavaScriptCorePrivateForwardingHeaders

    WTFForwardingHeaders

    JavaScriptCoreFrameworkHeaders

    JavaScriptCorePrivateFrameworkHeaders

    WTFFrameworkHeaders

)

if (ENABLE_WEBCORE)

24 list(APPEND TestWebKitAPI_DEPENDENCIES PALF~~orwarding~~Headers)

24 list(APPEND TestWebKitAPI_DEPENDENCIES PALFrameworkHeaders)

endif ()

if (ENABLE_WEBKIT)

Tools/TestWebKitAPI/PlatformWin.cmake

@@include_directories(

    ${FORWARDING_HEADERS_DIR}/JavaScriptCore

    ${TESTWEBKITAPI_DIR}/win

    ${DERIVED_SOURCES_DIR}/WebKit/Interfaces

    ${WTF_FRAMEWORK_HEADERS_DIR}

    ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}

    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}

    ${PAL_FRAMEWORK_HEADERS_DIR}

    ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}

    ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}

    ${WebKit_FRAMEWORK_HEADERS_DIR}

    ${WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR}

)

add_definitions(-DWEBCORE_EXPORT= -DWEBCORE_TESTSUPPORT_EXPORT=)

@@if (USE_CF)

    )

endif ()

102 list(APPEND TestWebKitAPI_DEPENDENCIES WebCoreF~~orwarding~~Headers)

110list(APPEND TestWebKitAPI_DEPENDENCIES WebCorePrivateFrameworkHeaders)

103111if (ENABLE_WEBKIT)

104 list(APPEND TestWebKitAPI_DEPENDENCIES WebKitF~~orwarding~~Headers)

112 list(APPEND TestWebKitAPI_DEPENDENCIES WebKitFrameworkHeaders)

endif ()

add_library(TestWTFLib SHARED