Attachment #259423 for bug #148198

View Details Raw Unified Return to Bug 148198

| Differences between



2015-08-19  Alex Christensen  <achristensen@webkit.org>

        CMake Windows build should not include files directly from other Source directories
        https://bugs.webkit.org/show_bug.cgi?id=148198

        Reviewed by NOBODY (OOPS!).

        * Source/cmake/WebKitMacros.cmake:

2015-08-19  Alex Christensen  <achristensen@webkit.org>

        Build TestWTF on Mac with CMake.



2015-08-19  Alex Christensen  <achristensen@webkit.org>

        CMake Windows build should not include files directly from other Source directories
        https://bugs.webkit.org/show_bug.cgi?id=148198

        Reviewed by NOBODY (OOPS!).

        * CMakeLists.txt:
        JavaScriptCore_FORWARDING_HEADERS_FILES is no longer necessary because all the headers
        that used to be in it are now in JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES
        * PlatformWin.cmake:

2015-08-19  Joseph Pecoraro  <pecoraro@apple.com>

        Web Inspector: Unexpected node preview format for an element with newlines in className attribute



set(JavaScriptCore_INCLUDE_DIRECTORIES
    "${CMAKE_BINARY_DIR}"
    "${JAVASCRIPTCORE_DIR}"
    "${JAVASCRIPTCORE_DIR}/.."
    "${JAVASCRIPTCORE_DIR}/API"
    "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
    "${JAVASCRIPTCORE_DIR}/assembler"

    "${JAVASCRIPTCORE_DIR}/tools"
    "${JAVASCRIPTCORE_DIR}/wasm"
    "${JAVASCRIPTCORE_DIR}/yarr"
    "${WTF_DIR}"
    "${DERIVED_SOURCES_DIR}"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
    "${CMAKE_SOURCE_DIR}/Source"
)

set(JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES

endforeach ()

set(JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES
    API
    assembler
    bindings
    bytecode
    debugger
    dfg
    disassembler
    heap
    inspector
    interpreter

    inspector/agents
    inspector/augmentable
    inspector/remote

    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
)

set(JavaScriptCore_FORWARDING_HEADERS_FILES
    API/APICallbackFunction.h
    API/APICast.h
    API/JSAPIWrapperObject.h
    API/JSBase.h
    API/JSBasePrivate.h
    API/JSCTestRunnerUtils.h
    API/JSCallbackConstructor.h
    API/JSCallbackFunction.h
    API/JSCallbackObject.h
    API/JSCallbackObjectFunctions.h
    API/JSClassRef.h
    API/JSContext.h
    API/JSContextInternal.h
    API/JSContextPrivate.h
    API/JSContextRef.h
    API/JSContextRefInternal.h
    API/JSContextRefPrivate.h
    API/JSExport.h
    API/JSManagedValue.h
    API/JSManagedValueInternal.h
    API/JSObjectRef.h
    API/JSObjectRefPrivate.h
    API/JSProfilerPrivate.h
    API/JSRetainPtr.h
    API/JSScriptRefPrivate.h
    API/JSStringRef.h
    API/JSStringRefBSTR.h
    API/JSStringRefCF.h
    API/JSStringRefPrivate.h
    API/JSValue.h
    API/JSValueInternal.h
    API/JSValueRef.h
    API/JSVirtualMachine.h
    API/JSVirtualMachineInternal.h
    API/JSWeakObjectMapRefInternal.h
    API/JSWeakObjectMapRefPrivate.h
    API/JSWrapperMap.h
    API/JavaScript.h
    API/JavaScriptCore.h
    API/ObjcRuntimeExtras.h
    API/OpaqueJSString.h
    API/WebKitAvailability.h

    assembler/LinkBuffer.h
    assembler/MacroAssembler.h
    assembler/MacroAssemblerCodeRef.h

    inspector/augmentable/AugmentableInspectorController.h

    inspector/remote/RemoteInspector.h
    inspector/remote/RemoteInspectorConstants.h
    inspector/remote/RemoteInspectorDebuggable.h
    inspector/remote/RemoteInspectorDebuggableConnection.h
    inspector/remote/RemoteInspectorXPCConnection.h

    jit/GPRInfo.h

    runtime/VM.h

    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.h
    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h
)


# GENERATOR 1-B: particular LUT creator (for 1 file only)
GENERATE_HASH_LUT(${CMAKE_CURRENT_SOURCE_DIR}/parser/Keywords.table ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Lexer.lut.h)


set_target_properties(JavaScriptCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore")
set_target_properties(JavaScriptCore PROPERTIES FOLDER "JavaScriptCore")

if (JavaScriptCore_POST_BUILD_COMMAND)
    add_custom_command(TARGET JavaScriptCore POST_BUILD COMMAND ${JavaScriptCore_POST_BUILD_COMMAND} VERBATIM)
endif ()

if (JavaScriptCore_OUTPUT_NAME)
    set_target_properties(JavaScriptCore PROPERTIES OUTPUT_NAME ${JavaScriptCore_OUTPUT_NAME})
endif ()

Lines 35-38 file(COPY Source/JavaScriptCore/PlatformWin.cmake_sec1
- Source/JavaScriptCore/PlatformWin.cmake +11 lines
35	${CMAKE_RUNTIME_OUTPUT_DIRECTORY}	35	${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
36	)	36	)
37		37
		38	foreach (_directory ${JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES})
		39	file(GLOB _files "${JAVASCRIPTCORE_DIR}/${_directory}/*.h")
		40	foreach (_file ${_files})
		41	file(COPY ${_file} DESTINATION "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore")
		42	endforeach ()
		43	endforeach ()
		44
		45	set(JavaScriptCore_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore/postBuild.cmd")
		46	file(WRITE "${JavaScriptCore_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/inspector/.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n")
		47	file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore)
		48
38	set(JavaScriptCore_OUTPUT_NAME JavaScriptCore${DEBUG_SUFFIX})	49	set(JavaScriptCore_OUTPUT_NAME JavaScriptCore${DEBUG_SUFFIX})



2015-08-19  Alex Christensen  <achristensen@webkit.org>

        CMake Windows build should not include files directly from other Source directories
        https://bugs.webkit.org/show_bug.cgi?id=148198

        Reviewed by NOBODY (OOPS!).

        * wtf/CMakeLists.txt:
        * wtf/PlatformWin.cmake:

2015-08-18  Filip Pizlo  <fpizlo@apple.com>

        Replace all uses of std::mutex/std::condition_variable with WTF::Lock/WTF::Condition

Lines 273-278 target_link_libraries(WTF ${WTF_LIBRARIE Source/WTF/wtf/CMakeLists.txt_sec1
- Source/WTF/wtf/CMakeLists.txt +4 lines
273	set_target_properties(WTF PROPERTIES COMPILE_DEFINITIONS "BUILDING_WTF")	273	set_target_properties(WTF PROPERTIES COMPILE_DEFINITIONS "BUILDING_WTF")
274	set_target_properties(WTF PROPERTIES FOLDER "JavaScriptCore")	274	set_target_properties(WTF PROPERTIES FOLDER "JavaScriptCore")
275		275
		276	if (WTF_POST_BUILD_COMMAND)
		277	add_custom_command(TARGET WTF POST_BUILD COMMAND ${WTF_POST_BUILD_COMMAND} VERBATIM)
		278	endif ()
		279
276	if (WTF_OUTPUT_NAME)	280	if (WTF_OUTPUT_NAME)
277	set_target_properties(WTF PROPERTIES OUTPUT_NAME ${WTF_OUTPUT_NAME})	281	set_target_properties(WTF PROPERTIES OUTPUT_NAME ${WTF_OUTPUT_NAME})
278	endif ()	282	endif ()

Lines 29-34 list(APPEND WTF_HEADERS Source/WTF/wtf/PlatformWin.cmake_sec1
- Source/WTF/wtf/PlatformWin.cmake +4 lines
29	"${DERIVED_SOURCES_WTF_DIR}/WTFHeaderDetection.h"	29	"${DERIVED_SOURCES_WTF_DIR}/WTFHeaderDetection.h"
30	)	30	)
31		31
		32	set(WTF_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WTF/postBuild.cmd")
		33	file(WRITE "${WTF_POST_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WTF_DIR}/wtf/.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF\" >nul 2>nul\n@xcopy /y /s /d /f \"${DERIVED_SOURCES_DIR}/WTF/.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF\" >nul 2>nul\n")
		34	file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF)
		35
32	# FIXME: This should run testOSXLevel.cmd if it is available.	36	# FIXME: This should run testOSXLevel.cmd if it is available.
33	# https://bugs.webkit.org/show_bug.cgi?id=135861	37	# https://bugs.webkit.org/show_bug.cgi?id=135861
34	add_custom_command(	38	add_custom_command(



2015-08-19  Alex Christensen  <achristensen@webkit.org>

        CMake Windows build should not include files directly from other Source directories
        https://bugs.webkit.org/show_bug.cgi?id=148198

        Reviewed by NOBODY (OOPS!).

        * CMakeLists.txt:
        * PlatformEfl.cmake:
        * PlatformGTK.cmake:
        * PlatformWin.cmake:

2015-08-19  Anders Carlsson  <andersca@apple.com>

        Fix errors on bots.




set(WebCore_INCLUDE_DIRECTORIES
    "${WEBCORE_DIR}"
    "${WEBCORE_DIR}/ForwardingHeaders"
    "${WEBCORE_DIR}/Modules/airplay"
    "${WEBCORE_DIR}/Modules/battery"
    "${WEBCORE_DIR}/Modules/encryptedmedia"

    "${WEBCORE_DIR}/workers"
    "${WEBCORE_DIR}/xml"
    "${WEBCORE_DIR}/xml/parser"
    "${JAVASCRIPTCORE_DIR}"
    "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
    "${JAVASCRIPTCORE_DIR}/API"
    "${JAVASCRIPTCORE_DIR}/assembler"
    "${JAVASCRIPTCORE_DIR}/bytecode"
    "${JAVASCRIPTCORE_DIR}/bytecompiler"
    "${JAVASCRIPTCORE_DIR}/dfg"
    "${JAVASCRIPTCORE_DIR}/disassembler"
    "${JAVASCRIPTCORE_DIR}/heap"
    "${JAVASCRIPTCORE_DIR}/debugger"
    "${JAVASCRIPTCORE_DIR}/interpreter"
    "${JAVASCRIPTCORE_DIR}/jit"
    "${JAVASCRIPTCORE_DIR}/llint"
    "${JAVASCRIPTCORE_DIR}/parser"
    "${JAVASCRIPTCORE_DIR}/profiler"
    "${JAVASCRIPTCORE_DIR}/runtime"
    "${JAVASCRIPTCORE_DIR}/yarr"
    "${WTF_DIR}"
    "${DERIVED_SOURCES_DIR}"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
    "${DERIVED_SOURCES_WEBCORE_DIR}"
    "${CMAKE_SOURCE_DIR}/Source"
    "${CMAKE_BINARY_DIR}"

    ADD_TARGET_PROPERTIES(WebCore COMPILE_FLAGS "-fno-tree-sra")
endif ()

if (WebCore_POST_BUILD_COMMAND)
    add_custom_command(TARGET WebCore POST_BUILD COMMAND ${WebCore_POST_BUILD_COMMAND} VERBATIM)
endif ()

if (WebCore_OUTPUT_NAME)
    set_target_properties(WebCore PROPERTIES OUTPUT_NAME ${WebCore_OUTPUT_NAME})
endif ()


target_link_libraries(WebCore ${WebCore_LIBRARIES})

if (WebCore_OUTPUT_NAME)
    set_target_properties(WebCore PROPERTIES OUTPUT_NAME ${WebCore_OUTPUT_NAME})
endif ()

if (SHARED_CORE)
    set_target_properties(WebCore PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
    install(TARGETS WebCore DESTINATION "${LIB_INSTALL_DIR}")



list(APPEND WebCore_INCLUDE_DIRECTORIES
    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
    "${JAVASCRIPTCORE_DIR}"
    "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
    "${JAVASCRIPTCORE_DIR}/API"
    "${JAVASCRIPTCORE_DIR}/assembler"
    "${JAVASCRIPTCORE_DIR}/bytecode"
    "${JAVASCRIPTCORE_DIR}/bytecompiler"
    "${JAVASCRIPTCORE_DIR}/dfg"
    "${JAVASCRIPTCORE_DIR}/disassembler"
    "${JAVASCRIPTCORE_DIR}/heap"
    "${JAVASCRIPTCORE_DIR}/debugger"
    "${JAVASCRIPTCORE_DIR}/interpreter"
    "${JAVASCRIPTCORE_DIR}/jit"
    "${JAVASCRIPTCORE_DIR}/llint"
    "${JAVASCRIPTCORE_DIR}/parser"
    "${JAVASCRIPTCORE_DIR}/profiler"
    "${JAVASCRIPTCORE_DIR}/runtime"
    "${JAVASCRIPTCORE_DIR}/yarr"
    "${WEBCORE_DIR}/editing/atk"
    "${WEBCORE_DIR}/page/efl"
    "${WEBCORE_DIR}/page/scrolling/coordinatedgraphics"

    "${WEBCORE_DIR}/platform/network/soup"
    "${WEBCORE_DIR}/platform/text/efl"
    "${WEBCORE_DIR}/plugins/efl"
    "${WTF_DIR}"
    "${WTF_DIR}/wtf/efl"
)




set(WebCore_OUTPUT_NAME WebCoreGTK)

list(APPEND WebCore_INCLUDE_DIRECTORIES
    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
    "${JAVASCRIPTCORE_DIR}"
    "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
    "${JAVASCRIPTCORE_DIR}/API"
    "${JAVASCRIPTCORE_DIR}/assembler"
    "${JAVASCRIPTCORE_DIR}/bytecode"
    "${JAVASCRIPTCORE_DIR}/bytecompiler"
    "${JAVASCRIPTCORE_DIR}/dfg"
    "${JAVASCRIPTCORE_DIR}/disassembler"
    "${JAVASCRIPTCORE_DIR}/heap"
    "${JAVASCRIPTCORE_DIR}/debugger"
    "${JAVASCRIPTCORE_DIR}/interpreter"
    "${JAVASCRIPTCORE_DIR}/jit"
    "${JAVASCRIPTCORE_DIR}/llint"
    "${JAVASCRIPTCORE_DIR}/parser"
    "${JAVASCRIPTCORE_DIR}/profiler"
    "${JAVASCRIPTCORE_DIR}/runtime"
    "${JAVASCRIPTCORE_DIR}/yarr"
    "${WEBCORE_DIR}/accessibility/atk"
    "${WEBCORE_DIR}/editing/atk"
    "${WEBCORE_DIR}/page/gtk"

    "${WEBCORE_DIR}/platform/network/gtk"
    "${WEBCORE_DIR}/platform/network/soup"
    "${WEBCORE_DIR}/platform/text/gtk"
    "${WTF_DIR}"
)

list(APPEND WebCore_SOURCES



add_definitions(/bigobj)

list(APPEND WebCore_INCLUDE_DIRECTORIES
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/ForwardingHeaders"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/API"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/assembler"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/bytecode"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/bytecompiler"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/dfg"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/disassembler"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/heap"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/debugger"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/interpreter"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/jit"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/llint"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/parser"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/profiler"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/runtime"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/yarr"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF"
    "${WEBCORE_DIR}/accessibility/win"
    "${WEBCORE_DIR}/page/win"
    "${WEBCORE_DIR}/platform/cf"

)

set(WebCore_FORWARDING_HEADERS_DIRECTORIES
    .
    accessibility
    bindings
    bridge

    plugins
    rendering
    storage
    style
    svg
    websockets
    workers


    html/forms
    html/parser
    html/shadow
    html/track

    loader/appcache
    loader/archive

    loader/archive/cf

    page/animation
    page/scrolling
    page/win

    platform/animation
    platform/audio
    platform/cf
    platform/graphics
    platform/mock


    platform/cf/win

    platform/graphics/filters
    platform/graphics/opengl
    platform/graphics/opentype
    platform/graphics/texmap


    platform/text/transcoder

    rendering/line
    rendering/shapes
    rendering/style
    rendering/svg


    include(PlatformAppleWin.cmake)
endif ()

WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES})

# FIXME: This should test if AVF headers are available.
# https://bugs.webkit.org/show_bug.cgi?id=135861
add_custom_command(

    ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/en.lproj
)

file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore)

foreach (_directory ${WebCore_FORWARDING_HEADERS_DIRECTORIES})
    file(GLOB _files "${WEBCORE_DIR}/${_directory}/*.h")
    foreach (_file ${_files})
        file(COPY ${_file} DESTINATION "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore")
    endforeach ()
endforeach ()

# These forwarding headers need to keep their directory structure.
set(WebCore_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebCore/postBuild.cmd")
file(WRITE "${WebCore_POST_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WEBCORE_DIR}/ForwardingHeaders/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n@xcopy /y /s /d /f \"${DERIVED_SOURCES_WEBCORE_DIR}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")

file(GLOB_RECURSE _files "${WEBCORE_DIR}/ForwardingHeaders/*.h")
foreach (_file ${_files})
    file(COPY ${_file} DESTINATION "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore")
endforeach ()

set(WebCore_OUTPUT_NAME
    WebCore${DEBUG_SUFFIX}
)



2015-08-19  Alex Christensen  <achristensen@webkit.org>

        CMake Windows build should not include files directly from other Source directories
        https://bugs.webkit.org/show_bug.cgi?id=148198

        Reviewed by NOBODY (OOPS!).

        * CMakeLists.txt:
        * PlatformWin.cmake:

2015-08-17  Filip Pizlo  <fpizlo@apple.com>

        Replace all remaining uses of WTF::Mutex with WTF::Lock



    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy"
    "${JAVASCRIPTCORE_DIR}"
    "${JAVASCRIPTCORE_DIR}/disassembler"
    "${WTF_DIR}"
)

set(WebKit_SYSTEM_INCLUDE_DIRECTORIES "")



        PRIVATE CoreText${DEBUG_SUFFIX}
        PRIVATE CoreVideo${DEBUG_SUFFIX}
        PRIVATE MediaAccessibility${DEBUG_SUFFIX}
        PRIVATE MediaToolbox${DEBUG_SUFFIX}
        PRIVATE QuartzCore${DEBUG_SUFFIX}
        PRIVATE SQLite3${DEBUG_SUFFIX}
        PRIVATE WebKitSystemInterface${DEBUG_SUFFIX}

    win/WebCoreSupport
    WebCoreSupport
    WebKit.vcxproj/WebKit
    "${WEBKIT_DIR}/.."
    "${DERIVED_SOURCES_WEBKIT_DIR}/include"
    "${CMAKE_SOURCE_DIR}/Source"
    "${DERIVED_SOURCES_WEBKIT_DIR}/include/WebCore"
    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
    "${DERIVED_SOURCES_WEBCORE_DIR}"
    "${DERIVED_SOURCES_DIR}"
    "${JAVASCRIPTCORE_DIR}/dfg"
    "${WEBCORE_DIR}/style"
    "${WEBCORE_DIR}/loader/archive"
    "${WEBCORE_DIR}/loader/archive/cf"
    "${WEBCORE_DIR}/page/scrolling"
    "${WEBCORE_DIR}/platform/cf"
    "${WEBCORE_DIR}/platform/graphics/win"
    "${WEBCORE_DIR}/platform/graphics/filters"
    "${WEBCORE_DIR}/platform/audio"
    "${WEBCORE_DIR}/platform/win"
    "${WEBCORE_DIR}/rendering/line"
    "${WEBCORE_DIR}/rendering/shapes"
    "${WEBCORE_DIR}/html/shadow"
    "${WEBCORE_DIR}/html/track"
    "${WEBCORE_DIR}/modules/websockets"
    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces"
    "${DERIVED_SOURCES_DIR}"
    "${THIRDPARTY_DIR}"
    "${THIRDPARTY_DIR}/ANGLE"
    "${THIRDPARTY_DIR}/ANGLE/include"
    "${THIRDPARTY_DIR}/ANGLE/include/egl"
    "${THIRDPARTY_DIR}/ANGLE/include/khr"
)

list(APPEND WebKit_INCLUDES

file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces)

set(WebKitGUID_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKit/postBuild.cmd")
file(WRITE "${WebKitGUID_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/WebKit.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/WebKitCOMAPI.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/CFDictionaryPropertyBag.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n")
file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit)
add_custom_command(TARGET WebKitGUID POST_BUILD COMMAND ${WebKitGUID_POST_BUILD_COMMAND} VERBATIM)
)

WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit_FORWARDING_HEADERS})



2015-08-19  Alex Christensen  <achristensen@webkit.org>

        CMake Windows build should not include files directly from other Source directories
        https://bugs.webkit.org/show_bug.cgi?id=148198

        Reviewed by NOBODY (OOPS!).

        * WebKitPrefix.h:
        Include cmakeconfig.h to properly define all enabled features.

2015-08-17  Filip Pizlo  <fpizlo@apple.com>

        Replace all remaining uses of WTF::Mutex with WTF::Lock

Lines 43-48 Source/WebKit/win/WebKitPrefix.h_sec1
- Source/WebKit/win/WebKitPrefix.h +4 lines
43	#define __STDC_LIMIT_MACROS	43	#define __STDC_LIMIT_MACROS
44	#endif	44	#endif
45		45
		46	#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
		47	#include "cmakeconfig.h"
		48	#endif
		49
46	#include <CoreFoundation/CoreFoundation.h>	50	#include <CoreFoundation/CoreFoundation.h>
47	#include <WebKit/WebKit.h>	51	#include <WebKit/WebKit.h>
48	#include "config.h"	52	#include "config.h"



endmacro()

macro(WEBKIT_CREATE_FORWARDING_HEADERS _framework)
    # On Windows, we copy the entire contents of forwarding headers.
    if (NOT WIN32)
        set(_processing_directories 0)
        set(_processing_files 0)
        set(_target_directory "${DERIVED_SOURCES_DIR}/ForwardingHeaders/${_framework}")

        file(GLOB _files "${_target_directory}/*.h")
        foreach (_file ${_files})
            file(READ "${_file}" _content)
            string(REGEX MATCH "^#include \"([^\"]*)\"" _matched ${_content})
            if (_matched AND NOT EXISTS "${CMAKE_SOURCE_DIR}/Source/${CMAKE_MATCH_1}")
               file(REMOVE "${_file}")
            endif ()
        endforeach ()

        foreach (_currentArg ${ARGN})
            if ("${_currentArg}" STREQUAL "DIRECTORIES")
                set(_processing_directories 1)
                set(_processing_files 0)
            elseif ("${_currentArg}" STREQUAL "FILES")
                set(_processing_directories 0)
                set(_processing_files 1)
            elseif (_processing_directories)
                file(GLOB _files "${_currentArg}/*.h")
                foreach (_file ${_files})
                    WEBKIT_CREATE_FORWARDING_HEADER(${_target_directory} ${_file})
                endforeach ()
            elseif (_processing_files)
                WEBKIT_CREATE_FORWARDING_HEADER(${_target_directory} ${_currentArg})
            endif ()
        endforeach ()
    endif ()
endmacro()

# Helper macro which wraps generate-message-receiver.py and generate-message-header.py scripts



2015-08-19  Alex Christensen  <achristensen@webkit.org>

        CMake Windows build should not include files directly from other Source directories
        https://bugs.webkit.org/show_bug.cgi?id=148198

        Reviewed by NOBODY (OOPS!).

        * DumpRenderTree/DumpRenderTreePrefix.h:
        Include cmakeconfig.h to properly define all enabled features.
        * DumpRenderTree/PlatformWin.cmake:
        * TestWebKitAPI/PlatformWin.cmake:

2015-08-19  Alex Christensen  <achristensen@webkit.org>

        Build TestWTF on Mac with CMake.

Lines 26-31 Tools/DumpRenderTree/DumpRenderTreePrefix.h_sec1
- Tools/DumpRenderTree/DumpRenderTreePrefix.h +4 lines
26	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	26	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27	*/	27	*/
28		28
		29	#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
		30	#include "cmakeconfig.h"
		31	#endif
		32
29	#include <wtf/Platform.h>	33	#include <wtf/Platform.h>
30		34
31	#ifdef __OBJC__	35	#ifdef __OBJC__

Lines 67-72 list(APPEND DumpRenderTree_INCLUDE_DIREC Tools/DumpRenderTree/PlatformWin.cmake_sec1
- Tools/DumpRenderTree/PlatformWin.cmake +1 lines
67	TestNetscapePlugin/Tests	67	TestNetscapePlugin/Tests
68	TestNetscapePlugin/win	68	TestNetscapePlugin/win
69	TestNetscapePlugin/Tests/win	69	TestNetscapePlugin/Tests/win
		70	${DERIVED_SOURCES_DIR}/WebKit/Interfaces
70	)	71	)
71		72
72	list(APPEND DumpRenderTree_LIBRARIES	73	list(APPEND DumpRenderTree_LIBRARIES



    ${DERIVED_SOURCES_DIR}
    ${DERIVED_SOURCES_DIR}/ForwardingHeaders
    ${TESTWEBKITAPI_DIR}/win
    ${DERIVED_SOURCES_DIR}/WebKit/Interfaces
)

add_definitions(-DWEBCORE_EXPORT=)

    )
else ()
    list(APPEND test_webcore_LIBRARIES
        ASL${DEBUG_SUFFIX}
        AVFoundationCF${DEBUG_SUFFIX}
        CFNetwork${DEBUG_SUFFIX}
        CoreAudioToolbox${DEBUG_SUFFIX}
        CoreFoundation${DEBUG_SUFFIX}
        CoreGraphics${DEBUG_SUFFIX}
        CoreMedia${DEBUG_SUFFIX}
        CoreText${DEBUG_SUFFIX}
        CoreVideo${DEBUG_SUFFIX}
        MediaAccessibility${DEBUG_SUFFIX}
        QuartzCore${DEBUG_SUFFIX}
        SQLite3${DEBUG_SUFFIX}
        WebKitSystemInterface${DEBUG_SUFFIX}
        WebKitQuartzCoreAdditions${DEBUG_SUFFIX}
        libdispatch${DEBUG_SUFFIX}
        libexslt${DEBUG_SUFFIX}
        libicuin${DEBUG_SUFFIX}
        libicuuc${DEBUG_SUFFIX}
        libxml2${DEBUG_SUFFIX}
        libxslt${DEBUG_SUFFIX}
        zdll${DEBUG_SUFFIX}
    )
endif ()


Return to Bug 148198

Lines 1-3 ChangeLog_sec1
- ChangeLog +9 lines
		1	2015-08-19 Alex Christensen <achristensen@webkit.org>
		2
		3	CMake Windows build should not include files directly from other Source directories
		4	https://bugs.webkit.org/show_bug.cgi?id=148198
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* Source/cmake/WebKitMacros.cmake:
		9
1	2015-08-19 Alex Christensen <achristensen@webkit.org>	10	2015-08-19 Alex Christensen <achristensen@webkit.org>
2		11
3	Build TestWTF on Mac with CMake.	12	Build TestWTF on Mac with CMake.

Lines 1-3 Source/JavaScriptCore/ChangeLog_sec1
- Source/JavaScriptCore/ChangeLog +12 lines
		1	2015-08-19 Alex Christensen <achristensen@webkit.org>
		2
		3	CMake Windows build should not include files directly from other Source directories
		4	https://bugs.webkit.org/show_bug.cgi?id=148198
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* CMakeLists.txt:
		9	JavaScriptCore_FORWARDING_HEADERS_FILES is no longer necessary because all the headers
		10	that used to be in it are now in JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES
		11	* PlatformWin.cmake:
		12
1	2015-08-19 Joseph Pecoraro <pecoraro@apple.com>	13	2015-08-19 Joseph Pecoraro <pecoraro@apple.com>
2		14
3	Web Inspector: Unexpected node preview format for an element with newlines in className attribute	15	Web Inspector: Unexpected node preview format for an element with newlines in className attribute

Lines 4-9 include(WebKitCommon) Source/JavaScriptCore/CMakeLists.txt_sec1
- Source/JavaScriptCore/CMakeLists.txt -70 / +8 lines
4	set(JavaScriptCore_INCLUDE_DIRECTORIES	4	set(JavaScriptCore_INCLUDE_DIRECTORIES
5	"${CMAKE_BINARY_DIR}"	5	"${CMAKE_BINARY_DIR}"
6	"${JAVASCRIPTCORE_DIR}"	6	"${JAVASCRIPTCORE_DIR}"
		7	"${JAVASCRIPTCORE_DIR}/.."
7	"${JAVASCRIPTCORE_DIR}/API"	8	"${JAVASCRIPTCORE_DIR}/API"
8	"${JAVASCRIPTCORE_DIR}/ForwardingHeaders"	9	"${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
9	"${JAVASCRIPTCORE_DIR}/assembler"	10	"${JAVASCRIPTCORE_DIR}/assembler"
Lines 31-42 set(JavaScriptCore_INCLUDE_DIRECTORIES Source/JavaScriptCore/CMakeLists.txt_sec2
31	"${JAVASCRIPTCORE_DIR}/tools"	32	"${JAVASCRIPTCORE_DIR}/tools"
32	"${JAVASCRIPTCORE_DIR}/wasm"	33	"${JAVASCRIPTCORE_DIR}/wasm"
33	"${JAVASCRIPTCORE_DIR}/yarr"	34	"${JAVASCRIPTCORE_DIR}/yarr"
34	"${WTF_DIR}"
35	"${DERIVED_SOURCES_DIR}"	35	"${DERIVED_SOURCES_DIR}"
36	"${DERIVED_SOURCES_DIR}/ForwardingHeaders"	36	"${DERIVED_SOURCES_DIR}/ForwardingHeaders"
37	"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"	37	"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
38	"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"	38	"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
39	"${CMAKE_SOURCE_DIR}/Source"
40	)	39	)
41		40
42	set(JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES	41	set(JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
Lines 920-929 foreach (_file ${JavaScriptCore_LUT_FILE Source/JavaScriptCore/CMakeLists.txt_sec3
920	endforeach ()	919	endforeach ()
921		920
922	set(JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES	921	set(JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES
		922	API
923	assembler	923	assembler
924	bindings	924	bindings
925	bytecode	925	bytecode
926	debugger	926	debugger
		927	dfg
		928	disassembler
927	heap	929	heap
928	inspector	930	inspector
929	interpreter	931	interpreter
Lines 939-1014 set(JavaScriptCore_FORWARDING_HEADERS_DI Source/JavaScriptCore/CMakeLists.txt_sec4
939	inspector/agents	941	inspector/agents
940	inspector/augmentable	942	inspector/augmentable
941	inspector/remote	943	inspector/remote
942
943	${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
944	)
945
946	set(JavaScriptCore_FORWARDING_HEADERS_FILES
947	API/APICallbackFunction.h
948	API/APICast.h
949	API/JSAPIWrapperObject.h
950	API/JSBase.h
951	API/JSBasePrivate.h
952	API/JSCTestRunnerUtils.h
953	API/JSCallbackConstructor.h
954	API/JSCallbackFunction.h
955	API/JSCallbackObject.h
956	API/JSCallbackObjectFunctions.h
957	API/JSClassRef.h
958	API/JSContext.h
959	API/JSContextInternal.h
960	API/JSContextPrivate.h
961	API/JSContextRef.h
962	API/JSContextRefInternal.h
963	API/JSContextRefPrivate.h
964	API/JSExport.h
965	API/JSManagedValue.h
966	API/JSManagedValueInternal.h
967	API/JSObjectRef.h
968	API/JSObjectRefPrivate.h
969	API/JSProfilerPrivate.h
970	API/JSRetainPtr.h
971	API/JSScriptRefPrivate.h
972	API/JSStringRef.h
973	API/JSStringRefBSTR.h
974	API/JSStringRefCF.h
975	API/JSStringRefPrivate.h
976	API/JSValue.h
977	API/JSValueInternal.h
978	API/JSValueRef.h
979	API/JSVirtualMachine.h
980	API/JSVirtualMachineInternal.h
981	API/JSWeakObjectMapRefInternal.h
982	API/JSWeakObjectMapRefPrivate.h
983	API/JSWrapperMap.h
984	API/JavaScript.h
985	API/JavaScriptCore.h
986	API/ObjcRuntimeExtras.h
987	API/OpaqueJSString.h
988	API/WebKitAvailability.h
989
990	assembler/LinkBuffer.h
991	assembler/MacroAssembler.h
992	assembler/MacroAssemblerCodeRef.h
993
994	inspector/augmentable/AugmentableInspectorController.h
995
996	inspector/remote/RemoteInspector.h
997	inspector/remote/RemoteInspectorConstants.h
998	inspector/remote/RemoteInspectorDebuggable.h
999	inspector/remote/RemoteInspectorDebuggableConnection.h
1000	inspector/remote/RemoteInspectorXPCConnection.h
1001
1002	jit/GPRInfo.h
1003
1004	runtime/VM.h
1005
1006	${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
1007	${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.h
1008	${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h
1009	)	944	)
1010		945
1011
1012	# GENERATOR 1-B: particular LUT creator (for 1 file only)	946	# GENERATOR 1-B: particular LUT creator (for 1 file only)
1013	GENERATE_HASH_LUT(${CMAKE_CURRENT_SOURCE_DIR}/parser/Keywords.table ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Lexer.lut.h)	947	GENERATE_HASH_LUT(${CMAKE_CURRENT_SOURCE_DIR}/parser/Keywords.table ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Lexer.lut.h)
1014		948
Lines 1198-1203 target_link_libraries(JavaScriptCore ${J Source/JavaScriptCore/CMakeLists.txt_sec5
1198	set_target_properties(JavaScriptCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore")	1132	set_target_properties(JavaScriptCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore")
1199	set_target_properties(JavaScriptCore PROPERTIES FOLDER "JavaScriptCore")	1133	set_target_properties(JavaScriptCore PROPERTIES FOLDER "JavaScriptCore")
1200		1134
		1135	if (JavaScriptCore_POST_BUILD_COMMAND)
		1136	add_custom_command(TARGET JavaScriptCore POST_BUILD COMMAND ${JavaScriptCore_POST_BUILD_COMMAND} VERBATIM)
		1137	endif ()
		1138
1201	if (JavaScriptCore_OUTPUT_NAME)	1139	if (JavaScriptCore_OUTPUT_NAME)
1202	set_target_properties(JavaScriptCore PROPERTIES OUTPUT_NAME ${JavaScriptCore_OUTPUT_NAME})	1140	set_target_properties(JavaScriptCore PROPERTIES OUTPUT_NAME ${JavaScriptCore_OUTPUT_NAME})
1203	endif ()	1141	endif ()

Lines 1-3 Source/WTF/ChangeLog_sec1
- Source/WTF/ChangeLog +10 lines
		1	2015-08-19 Alex Christensen <achristensen@webkit.org>
		2
		3	CMake Windows build should not include files directly from other Source directories
		4	https://bugs.webkit.org/show_bug.cgi?id=148198
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* wtf/CMakeLists.txt:
		9	* wtf/PlatformWin.cmake:
		10
1	2015-08-18 Filip Pizlo <fpizlo@apple.com>	11	2015-08-18 Filip Pizlo <fpizlo@apple.com>
2		12
3	Replace all uses of std::mutex/std::condition_variable with WTF::Lock/WTF::Condition	13	Replace all uses of std::mutex/std::condition_variable with WTF::Lock/WTF::Condition

Lines 1-3 Source/WebCore/ChangeLog_sec1
- Source/WebCore/ChangeLog +12 lines
		1	2015-08-19 Alex Christensen <achristensen@webkit.org>
		2
		3	CMake Windows build should not include files directly from other Source directories
		4	https://bugs.webkit.org/show_bug.cgi?id=148198
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* CMakeLists.txt:
		9	* PlatformEfl.cmake:
		10	* PlatformGTK.cmake:
		11	* PlatformWin.cmake:
		12
1	2015-08-19 Anders Carlsson <andersca@apple.com>	13	2015-08-19 Anders Carlsson <andersca@apple.com>
2		14
3	Fix errors on bots.	15	Fix errors on bots.

Lines 3-8 include(WebKitCommon) Source/WebCore/CMakeLists.txt_sec1
- Source/WebCore/CMakeLists.txt -24 / +5 lines
3		3
4	set(WebCore_INCLUDE_DIRECTORIES	4	set(WebCore_INCLUDE_DIRECTORIES
5	"${WEBCORE_DIR}"	5	"${WEBCORE_DIR}"
		6	"${WEBCORE_DIR}/ForwardingHeaders"
6	"${WEBCORE_DIR}/Modules/airplay"	7	"${WEBCORE_DIR}/Modules/airplay"
7	"${WEBCORE_DIR}/Modules/battery"	8	"${WEBCORE_DIR}/Modules/battery"
8	"${WEBCORE_DIR}/Modules/encryptedmedia"	9	"${WEBCORE_DIR}/Modules/encryptedmedia"
Lines 108-135 set(WebCore_INCLUDE_DIRECTORIES Source/WebCore/CMakeLists.txt_sec2
108	"${WEBCORE_DIR}/workers"	109	"${WEBCORE_DIR}/workers"
109	"${WEBCORE_DIR}/xml"	110	"${WEBCORE_DIR}/xml"
110	"${WEBCORE_DIR}/xml/parser"	111	"${WEBCORE_DIR}/xml/parser"
111	"${JAVASCRIPTCORE_DIR}"
112	"${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
113	"${JAVASCRIPTCORE_DIR}/API"
114	"${JAVASCRIPTCORE_DIR}/assembler"
115	"${JAVASCRIPTCORE_DIR}/bytecode"
116	"${JAVASCRIPTCORE_DIR}/bytecompiler"
117	"${JAVASCRIPTCORE_DIR}/dfg"
118	"${JAVASCRIPTCORE_DIR}/disassembler"
119	"${JAVASCRIPTCORE_DIR}/heap"
120	"${JAVASCRIPTCORE_DIR}/debugger"
121	"${JAVASCRIPTCORE_DIR}/interpreter"
122	"${JAVASCRIPTCORE_DIR}/jit"
123	"${JAVASCRIPTCORE_DIR}/llint"
124	"${JAVASCRIPTCORE_DIR}/parser"
125	"${JAVASCRIPTCORE_DIR}/profiler"
126	"${JAVASCRIPTCORE_DIR}/runtime"
127	"${JAVASCRIPTCORE_DIR}/yarr"
128	"${WTF_DIR}"
129	"${DERIVED_SOURCES_DIR}"	112	"${DERIVED_SOURCES_DIR}"
130	"${DERIVED_SOURCES_DIR}/ForwardingHeaders"	113	"${DERIVED_SOURCES_DIR}/ForwardingHeaders"
131	"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
132	"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
133	"${DERIVED_SOURCES_WEBCORE_DIR}"	114	"${DERIVED_SOURCES_WEBCORE_DIR}"
134	"${CMAKE_SOURCE_DIR}/Source"	115	"${CMAKE_SOURCE_DIR}/Source"
135	"${CMAKE_BINARY_DIR}"	116	"${CMAKE_BINARY_DIR}"
Lines 3639-3644 if (CMAKE_COMPILER_IS_GNUCXX AND "${LOWE Source/WebCore/CMakeLists.txt_sec3
3639	ADD_TARGET_PROPERTIES(WebCore COMPILE_FLAGS "-fno-tree-sra")	3620	ADD_TARGET_PROPERTIES(WebCore COMPILE_FLAGS "-fno-tree-sra")
3640	endif ()	3621	endif ()
3641		3622
		3623	if (WebCore_POST_BUILD_COMMAND)
		3624	add_custom_command(TARGET WebCore POST_BUILD COMMAND ${WebCore_POST_BUILD_COMMAND} VERBATIM)
		3625	endif ()
		3626
3642	if (WebCore_OUTPUT_NAME)	3627	if (WebCore_OUTPUT_NAME)
3643	set_target_properties(WebCore PROPERTIES OUTPUT_NAME ${WebCore_OUTPUT_NAME})	3628	set_target_properties(WebCore PROPERTIES OUTPUT_NAME ${WebCore_OUTPUT_NAME})
3644	endif ()	3629	endif ()
Lines 3675-3684 endif () Source/WebCore/CMakeLists.txt_sec4
3675		3660
3676	target_link_libraries(WebCore ${WebCore_LIBRARIES})	3661	target_link_libraries(WebCore ${WebCore_LIBRARIES})
3677		3662
3678	if (WebCore_OUTPUT_NAME)
3679	set_target_properties(WebCore PROPERTIES OUTPUT_NAME ${WebCore_OUTPUT_NAME})
3680	endif ()
3681
3682	if (SHARED_CORE)	3663	if (SHARED_CORE)
3683	set_target_properties(WebCore PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})	3664	set_target_properties(WebCore PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
3684	install(TARGETS WebCore DESTINATION "${LIB_INSTALL_DIR}")	3665	install(TARGETS WebCore DESTINATION "${LIB_INSTALL_DIR}")

Lines 1-4 Source/WebCore/PlatformEfl.cmake_sec1
- Source/WebCore/PlatformEfl.cmake +20 lines
1	list(APPEND WebCore_INCLUDE_DIRECTORIES	1	list(APPEND WebCore_INCLUDE_DIRECTORIES
		2	"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
		3	"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
		4	"${JAVASCRIPTCORE_DIR}"
		5	"${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
		6	"${JAVASCRIPTCORE_DIR}/API"
		7	"${JAVASCRIPTCORE_DIR}/assembler"
		8	"${JAVASCRIPTCORE_DIR}/bytecode"
		9	"${JAVASCRIPTCORE_DIR}/bytecompiler"
		10	"${JAVASCRIPTCORE_DIR}/dfg"
		11	"${JAVASCRIPTCORE_DIR}/disassembler"
		12	"${JAVASCRIPTCORE_DIR}/heap"
		13	"${JAVASCRIPTCORE_DIR}/debugger"
		14	"${JAVASCRIPTCORE_DIR}/interpreter"
		15	"${JAVASCRIPTCORE_DIR}/jit"
		16	"${JAVASCRIPTCORE_DIR}/llint"
		17	"${JAVASCRIPTCORE_DIR}/parser"
		18	"${JAVASCRIPTCORE_DIR}/profiler"
		19	"${JAVASCRIPTCORE_DIR}/runtime"
		20	"${JAVASCRIPTCORE_DIR}/yarr"
2	"${WEBCORE_DIR}/editing/atk"	21	"${WEBCORE_DIR}/editing/atk"
3	"${WEBCORE_DIR}/page/efl"	22	"${WEBCORE_DIR}/page/efl"
4	"${WEBCORE_DIR}/page/scrolling/coordinatedgraphics"	23	"${WEBCORE_DIR}/page/scrolling/coordinatedgraphics"
Lines 24-29 list(APPEND WebCore_INCLUDE_DIRECTORIES Source/WebCore/PlatformEfl.cmake_sec2
24	"${WEBCORE_DIR}/platform/network/soup"	43	"${WEBCORE_DIR}/platform/network/soup"
25	"${WEBCORE_DIR}/platform/text/efl"	44	"${WEBCORE_DIR}/platform/text/efl"
26	"${WEBCORE_DIR}/plugins/efl"	45	"${WEBCORE_DIR}/plugins/efl"
		46	"${WTF_DIR}"
27	"${WTF_DIR}/wtf/efl"	47	"${WTF_DIR}/wtf/efl"
28	)	48	)
29		49

Lines 1-6 Source/WebCore/PlatformGTK.cmake_sec1
- Source/WebCore/PlatformGTK.cmake +20 lines
1	set(WebCore_OUTPUT_NAME WebCoreGTK)	1	set(WebCore_OUTPUT_NAME WebCoreGTK)
2		2
3	list(APPEND WebCore_INCLUDE_DIRECTORIES	3	list(APPEND WebCore_INCLUDE_DIRECTORIES
		4	"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
		5	"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
		6	"${JAVASCRIPTCORE_DIR}"
		7	"${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
		8	"${JAVASCRIPTCORE_DIR}/API"
		9	"${JAVASCRIPTCORE_DIR}/assembler"
		10	"${JAVASCRIPTCORE_DIR}/bytecode"
		11	"${JAVASCRIPTCORE_DIR}/bytecompiler"
		12	"${JAVASCRIPTCORE_DIR}/dfg"
		13	"${JAVASCRIPTCORE_DIR}/disassembler"
		14	"${JAVASCRIPTCORE_DIR}/heap"
		15	"${JAVASCRIPTCORE_DIR}/debugger"
		16	"${JAVASCRIPTCORE_DIR}/interpreter"
		17	"${JAVASCRIPTCORE_DIR}/jit"
		18	"${JAVASCRIPTCORE_DIR}/llint"
		19	"${JAVASCRIPTCORE_DIR}/parser"
		20	"${JAVASCRIPTCORE_DIR}/profiler"
		21	"${JAVASCRIPTCORE_DIR}/runtime"
		22	"${JAVASCRIPTCORE_DIR}/yarr"
4	"${WEBCORE_DIR}/accessibility/atk"	23	"${WEBCORE_DIR}/accessibility/atk"
5	"${WEBCORE_DIR}/editing/atk"	24	"${WEBCORE_DIR}/editing/atk"
6	"${WEBCORE_DIR}/page/gtk"	25	"${WEBCORE_DIR}/page/gtk"
Lines 24-29 list(APPEND WebCore_INCLUDE_DIRECTORIES Source/WebCore/PlatformGTK.cmake_sec2
24	"${WEBCORE_DIR}/platform/network/gtk"	43	"${WEBCORE_DIR}/platform/network/gtk"
25	"${WEBCORE_DIR}/platform/network/soup"	44	"${WEBCORE_DIR}/platform/network/soup"
26	"${WEBCORE_DIR}/platform/text/gtk"	45	"${WEBCORE_DIR}/platform/text/gtk"
		46	"${WTF_DIR}"
27	)	47	)
28		48
29	list(APPEND WebCore_SOURCES	49	list(APPEND WebCore_SOURCES

Lines 1-6 Source/WebCore/PlatformWin.cmake_sec1
- Source/WebCore/PlatformWin.cmake -2 / +45 lines
1	add_definitions(/bigobj)	1	add_definitions(/bigobj)
2		2
3	list(APPEND WebCore_INCLUDE_DIRECTORIES	3	list(APPEND WebCore_INCLUDE_DIRECTORIES
		4	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
		5	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/ForwardingHeaders"
		6	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/API"
		7	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/assembler"
		8	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/bytecode"
		9	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/bytecompiler"
		10	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/dfg"
		11	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/disassembler"
		12	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/heap"
		13	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/debugger"
		14	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/interpreter"
		15	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/jit"
		16	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/llint"
		17	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/parser"
		18	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/profiler"
		19	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/runtime"
		20	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/yarr"
		21	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF"
4	"${WEBCORE_DIR}/accessibility/win"	22	"${WEBCORE_DIR}/accessibility/win"
5	"${WEBCORE_DIR}/page/win"	23	"${WEBCORE_DIR}/page/win"
6	"${WEBCORE_DIR}/platform/cf"	24	"${WEBCORE_DIR}/platform/cf"
Lines 132-137 list(APPEND WebCore_SOURCES Source/WebCore/PlatformWin.cmake_sec2
132	)	150	)
133		151
134	set(WebCore_FORWARDING_HEADERS_DIRECTORIES	152	set(WebCore_FORWARDING_HEADERS_DIRECTORIES
		153	.
135	accessibility	154	accessibility
136	bindings	155	bindings
137	bridge	156	bridge
Lines 147-152 set(WebCore_FORWARDING_HEADERS_DIRECTORI Source/WebCore/PlatformWin.cmake_sec3
147	plugins	166	plugins
148	rendering	167	rendering
149	storage	168	storage
		169	style
150	svg	170	svg
151	websockets	171	websockets
152	workers	172	workers
Lines 169-174 set(WebCore_FORWARDING_HEADERS_DIRECTORI Source/WebCore/PlatformWin.cmake_sec4
169		189
170	html/forms	190	html/forms
171	html/parser	191	html/parser
		192	html/shadow
		193	html/track
172		194
173	loader/appcache	195	loader/appcache
174	loader/archive	196	loader/archive
Lines 178-186 set(WebCore_FORWARDING_HEADERS_DIRECTORI Source/WebCore/PlatformWin.cmake_sec5
178	loader/archive/cf	200	loader/archive/cf
179		201
180	page/animation	202	page/animation
		203	page/scrolling
181	page/win	204	page/win
182		205
183	platform/animation	206	platform/animation
		207	platform/audio
184	platform/cf	208	platform/cf
185	platform/graphics	209	platform/graphics
186	platform/mock	210	platform/mock
Lines 191-196 set(WebCore_FORWARDING_HEADERS_DIRECTORI Source/WebCore/PlatformWin.cmake_sec6
191		215
192	platform/cf/win	216	platform/cf/win
193		217
		218	platform/graphics/filters
194	platform/graphics/opengl	219	platform/graphics/opengl
195	platform/graphics/opentype	220	platform/graphics/opentype
196	platform/graphics/texmap	221	platform/graphics/texmap
Lines 199-204 set(WebCore_FORWARDING_HEADERS_DIRECTORI Source/WebCore/PlatformWin.cmake_sec7
199		224
200	platform/text/transcoder	225	platform/text/transcoder
201		226
		227	rendering/line
		228	rendering/shapes
202	rendering/style	229	rendering/style
203	rendering/svg	230	rendering/svg
204		231
Lines 215-222 else () Source/WebCore/PlatformWin.cmake_sec8
215	include(PlatformAppleWin.cmake)	242	include(PlatformAppleWin.cmake)
216	endif ()	243	endif ()
217		244
218	WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES})
219
220	# FIXME: This should test if AVF headers are available.	245	# FIXME: This should test if AVF headers are available.
221	# https://bugs.webkit.org/show_bug.cgi?id=135861	246	# https://bugs.webkit.org/show_bug.cgi?id=135861
222	add_custom_command(	247	add_custom_command(
Lines 233-238 file(COPY Source/WebCore/PlatformWin.cmake_sec9
233	${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/en.lproj	258	${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/en.lproj
234	)	259	)
235		260
		261	file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore)
		262
		263	foreach (_directory ${WebCore_FORWARDING_HEADERS_DIRECTORIES})
		264	file(GLOB _files "${WEBCORE_DIR}/${_directory}/*.h")
		265	foreach (_file ${_files})
		266	file(COPY ${_file} DESTINATION "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore")
		267	endforeach ()
		268	endforeach ()
		269
		270	# These forwarding headers need to keep their directory structure.
		271	set(WebCore_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebCore/postBuild.cmd")
		272	file(WRITE "${WebCore_POST_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WEBCORE_DIR}/ForwardingHeaders/.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n@xcopy /y /s /d /f \"${DERIVED_SOURCES_WEBCORE_DIR}/.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
		273
		274	file(GLOB_RECURSE _files "${WEBCORE_DIR}/ForwardingHeaders/*.h")
		275	foreach (_file ${_files})
		276	file(COPY ${_file} DESTINATION "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore")
		277	endforeach ()
		278
236	set(WebCore_OUTPUT_NAME	279	set(WebCore_OUTPUT_NAME
237	WebCore${DEBUG_SUFFIX}	280	WebCore${DEBUG_SUFFIX}
238	)	281	)

Lines 1-3 Source/WebKit/ChangeLog_sec1
- Source/WebKit/ChangeLog +10 lines
		1	2015-08-19 Alex Christensen <achristensen@webkit.org>
		2
		3	CMake Windows build should not include files directly from other Source directories
		4	https://bugs.webkit.org/show_bug.cgi?id=148198
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* CMakeLists.txt:
		9	* PlatformWin.cmake:
		10
1	2015-08-17 Filip Pizlo <fpizlo@apple.com>	11	2015-08-17 Filip Pizlo <fpizlo@apple.com>
2		12
3	Replace all remaining uses of WTF::Mutex with WTF::Lock	13	Replace all remaining uses of WTF::Mutex with WTF::Lock

Lines 12-20 set(WebKit_INCLUDE_DIRECTORIES Source/WebKit/CMakeLists.txt_sec1
- Source/WebKit/CMakeLists.txt -3 lines
12	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"	12	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
13	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"	13	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
14	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy"	14	"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy"
15	"${JAVASCRIPTCORE_DIR}"
16	"${JAVASCRIPTCORE_DIR}/disassembler"
17	"${WTF_DIR}"
18	)	15	)
19		16
20	set(WebKit_SYSTEM_INCLUDE_DIRECTORIES "")	17	set(WebKit_SYSTEM_INCLUDE_DIRECTORIES "")

Lines 32-38 else () Source/WebKit/PlatformWin.cmake_sec1
- Source/WebKit/PlatformWin.cmake -34 / +6 lines
32	PRIVATE CoreText${DEBUG_SUFFIX}	32	PRIVATE CoreText${DEBUG_SUFFIX}
33	PRIVATE CoreVideo${DEBUG_SUFFIX}	33	PRIVATE CoreVideo${DEBUG_SUFFIX}
34	PRIVATE MediaAccessibility${DEBUG_SUFFIX}	34	PRIVATE MediaAccessibility${DEBUG_SUFFIX}
35	PRIVATE MediaToolbox${DEBUG_SUFFIX}
36	PRIVATE QuartzCore${DEBUG_SUFFIX}	35	PRIVATE QuartzCore${DEBUG_SUFFIX}
37	PRIVATE SQLite3${DEBUG_SUFFIX}	36	PRIVATE SQLite3${DEBUG_SUFFIX}
38	PRIVATE WebKitSystemInterface${DEBUG_SUFFIX}	37	PRIVATE WebKitSystemInterface${DEBUG_SUFFIX}
Lines 54-87 list(APPEND WebKit_INCLUDE_DIRECTORIES Source/WebKit/PlatformWin.cmake_sec2
54	win/WebCoreSupport	53	win/WebCoreSupport
55	WebCoreSupport	54	WebCoreSupport
56	WebKit.vcxproj/WebKit	55	WebKit.vcxproj/WebKit
		56	"${WEBKIT_DIR}/.."
57	"${DERIVED_SOURCES_WEBKIT_DIR}/include"	57	"${DERIVED_SOURCES_WEBKIT_DIR}/include"
58	"${CMAKE_SOURCE_DIR}/Source"
59	"${DERIVED_SOURCES_WEBKIT_DIR}/include/WebCore"
60	"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
61	"${DERIVED_SOURCES_WEBCORE_DIR}"
62	"${DERIVED_SOURCES_DIR}"
63	"${JAVASCRIPTCORE_DIR}/dfg"
64	"${WEBCORE_DIR}/style"
65	"${WEBCORE_DIR}/loader/archive"
66	"${WEBCORE_DIR}/loader/archive/cf"
67	"${WEBCORE_DIR}/page/scrolling"
68	"${WEBCORE_DIR}/platform/cf"
69	"${WEBCORE_DIR}/platform/graphics/win"
70	"${WEBCORE_DIR}/platform/graphics/filters"
71	"${WEBCORE_DIR}/platform/audio"
72	"${WEBCORE_DIR}/platform/win"
73	"${WEBCORE_DIR}/rendering/line"
74	"${WEBCORE_DIR}/rendering/shapes"
75	"${WEBCORE_DIR}/html/shadow"
76	"${WEBCORE_DIR}/html/track"
77	"${WEBCORE_DIR}/modules/websockets"
78	"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces"	58	"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces"
79	"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"	59	"${DERIVED_SOURCES_DIR}"
80	"${THIRDPARTY_DIR}"
81	"${THIRDPARTY_DIR}/ANGLE"
82	"${THIRDPARTY_DIR}/ANGLE/include"
83	"${THIRDPARTY_DIR}/ANGLE/include/egl"
84	"${THIRDPARTY_DIR}/ANGLE/include/khr"
85	)	60	)
86		61
87	list(APPEND WebKit_INCLUDES	62	list(APPEND WebKit_INCLUDES
Lines 480-489 endif () Source/WebKit/PlatformWin.cmake_sec3
480	file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})	455	file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
481	file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces)	456	file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces)
482		457
483	set(WebKit_FORWARDING_HEADERS	458	set(WebKitGUID_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKit/postBuild.cmd")
484	"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/WebKit.h"	459	file(WRITE "${WebKitGUID_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/WebKit.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/WebKitCOMAPI.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/CFDictionaryPropertyBag.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n")
485	"${CMAKE_CURRENT_SOURCE_DIR}/win/WebKitCOMAPI.h"	460	file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit)
486	"win/CFDictionaryPropertyBag.h"	461	add_custom_command(TARGET WebKitGUID POST_BUILD COMMAND ${WebKitGUID_POST_BUILD_COMMAND} VERBATIM)
487	)
488
489	WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit_FORWARDING_HEADERS})

Lines 1-3 Source/WebKit/win/ChangeLog_sec1
- Source/WebKit/win/ChangeLog +10 lines
		1	2015-08-19 Alex Christensen <achristensen@webkit.org>
		2
		3	CMake Windows build should not include files directly from other Source directories
		4	https://bugs.webkit.org/show_bug.cgi?id=148198
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* WebKitPrefix.h:
		9	Include cmakeconfig.h to properly define all enabled features.
		10
1	2015-08-17 Filip Pizlo <fpizlo@apple.com>	11	2015-08-17 Filip Pizlo <fpizlo@apple.com>
2		12
3	Replace all remaining uses of WTF::Mutex with WTF::Lock	13	Replace all remaining uses of WTF::Mutex with WTF::Lock

Lines 244-278 macro(WEBKIT_CREATE_FORWARDING_HEADER _t Source/cmake/WebKitMacros.cmake_sec1
- Source/cmake/WebKitMacros.cmake -29 / +32 lines
244	endmacro()	244	endmacro()
245		245
246	macro(WEBKIT_CREATE_FORWARDING_HEADERS _framework)	246	macro(WEBKIT_CREATE_FORWARDING_HEADERS _framework)
247	set(_processing_directories 0)	247	# On Windows, we copy the entire contents of forwarding headers.
248	set(_processing_files 0)	248	if (NOT WIN32)
249	set(_target_directory "${DERIVED_SOURCES_DIR}/ForwardingHeaders/${_framework}")	249	set(_processing_directories 0)
250		250	set(_processing_files 0)
251	file(GLOB _files "${_target_directory}/*.h")	251	set(_target_directory "${DERIVED_SOURCES_DIR}/ForwardingHeaders/${_framework}")
252	foreach (_file ${_files})	252
253	file(READ "${_file}" _content)	253	file(GLOB _files "${_target_directory}/*.h")
254	string(REGEX MATCH "^#include \"([^\"]*)\"" _matched ${_content})	254	foreach (_file ${_files})
255	if (_matched AND NOT EXISTS "${CMAKE_SOURCE_DIR}/Source/${CMAKE_MATCH_1}")	255	file(READ "${_file}" _content)
256	file(REMOVE "${_file}")	256	string(REGEX MATCH "^#include \"([^\"]*)\"" _matched ${_content})
257	endif ()	257	if (_matched AND NOT EXISTS "${CMAKE_SOURCE_DIR}/Source/${CMAKE_MATCH_1}")
258	endforeach ()	258	file(REMOVE "${_file}")
259		259	endif ()
260	foreach (_currentArg ${ARGN})	260	endforeach ()
261	if ("${_currentArg}" STREQUAL "DIRECTORIES")	261
262	set(_processing_directories 1)	262	foreach (_currentArg ${ARGN})
263	set(_processing_files 0)	263	if ("${_currentArg}" STREQUAL "DIRECTORIES")
264	elseif ("${_currentArg}" STREQUAL "FILES")	264	set(_processing_directories 1)
265	set(_processing_directories 0)	265	set(_processing_files 0)
266	set(_processing_files 1)	266	elseif ("${_currentArg}" STREQUAL "FILES")
267	elseif (_processing_directories)	267	set(_processing_directories 0)
268	file(GLOB _files "${_currentArg}/*.h")	268	set(_processing_files 1)
269	foreach (_file ${_files})	269	elseif (_processing_directories)
270	WEBKIT_CREATE_FORWARDING_HEADER(${_target_directory} ${_file})	270	file(GLOB _files "${_currentArg}/*.h")
271	endforeach ()	271	foreach (_file ${_files})
272	elseif (_processing_files)	272	WEBKIT_CREATE_FORWARDING_HEADER(${_target_directory} ${_file})
273	WEBKIT_CREATE_FORWARDING_HEADER(${_target_directory} ${_currentArg})	273	endforeach ()
274	endif ()	274	elseif (_processing_files)
275	endforeach ()	275	WEBKIT_CREATE_FORWARDING_HEADER(${_target_directory} ${_currentArg})
		276	endif ()
		277	endforeach ()
		278	endif ()
276	endmacro()	279	endmacro()
277		280
278	# Helper macro which wraps generate-message-receiver.py and generate-message-header.py scripts	281	# Helper macro which wraps generate-message-receiver.py and generate-message-header.py scripts

Lines 1-3 Tools/ChangeLog_sec1
- Tools/ChangeLog +12 lines
		1	2015-08-19 Alex Christensen <achristensen@webkit.org>
		2
		3	CMake Windows build should not include files directly from other Source directories
		4	https://bugs.webkit.org/show_bug.cgi?id=148198
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* DumpRenderTree/DumpRenderTreePrefix.h:
		9	Include cmakeconfig.h to properly define all enabled features.
		10	* DumpRenderTree/PlatformWin.cmake:
		11	* TestWebKitAPI/PlatformWin.cmake:
		12
1	2015-08-19 Alex Christensen <achristensen@webkit.org>	13	2015-08-19 Alex Christensen <achristensen@webkit.org>
2		14
3	Build TestWTF on Mac with CMake.	15	Build TestWTF on Mac with CMake.

Lines 10-15 include_directories( Tools/TestWebKitAPI/PlatformWin.cmake_sec1
- Tools/TestWebKitAPI/PlatformWin.cmake -3 / +22 lines
10	${DERIVED_SOURCES_DIR}	10	${DERIVED_SOURCES_DIR}
11	${DERIVED_SOURCES_DIR}/ForwardingHeaders	11	${DERIVED_SOURCES_DIR}/ForwardingHeaders
12	${TESTWEBKITAPI_DIR}/win	12	${TESTWEBKITAPI_DIR}/win
		13	${DERIVED_SOURCES_DIR}/WebKit/Interfaces
13	)	14	)
14		15
15	add_definitions(-DWEBCORE_EXPORT=)	16	add_definitions(-DWEBCORE_EXPORT=)
Lines 49-57 if (${WTF_PLATFORM_WIN_CAIRO}) Tools/TestWebKitAPI/PlatformWin.cmake_sec2
49	)	50	)
50	else ()	51	else ()
51	list(APPEND test_webcore_LIBRARIES	52	list(APPEND test_webcore_LIBRARIES
52	CFNetwork	53	ASL${DEBUG_SUFFIX}
53	CoreMedia	54	AVFoundationCF${DEBUG_SUFFIX}
54	WebKitSystemInterface	55	CFNetwork${DEBUG_SUFFIX}
		56	CoreAudioToolbox${DEBUG_SUFFIX}
		57	CoreFoundation${DEBUG_SUFFIX}
		58	CoreGraphics${DEBUG_SUFFIX}
		59	CoreMedia${DEBUG_SUFFIX}
		60	CoreText${DEBUG_SUFFIX}
		61	CoreVideo${DEBUG_SUFFIX}
		62	MediaAccessibility${DEBUG_SUFFIX}
		63	QuartzCore${DEBUG_SUFFIX}
		64	SQLite3${DEBUG_SUFFIX}
		65	WebKitSystemInterface${DEBUG_SUFFIX}
		66	WebKitQuartzCoreAdditions${DEBUG_SUFFIX}
		67	libdispatch${DEBUG_SUFFIX}
		68	libexslt${DEBUG_SUFFIX}
		69	libicuin${DEBUG_SUFFIX}
		70	libicuuc${DEBUG_SUFFIX}
		71	libxml2${DEBUG_SUFFIX}
		72	libxslt${DEBUG_SUFFIX}
		73	zdll${DEBUG_SUFFIX}
55	)	74	)
56	endif ()	75	endif ()
57		76