Attachment #459852 for bug #241002

View Details Raw Unified Return to Bug 241002

| Differences between



        COMMAND ${MASM_EXECUTABLE} ${LLINT_MASM_FLAGS} ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.asm
        VERBATIM)
    list(APPEND JavaScriptCore_SOURCES ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj)
    add_library(LowLevelInterpreterLib STATIC llint/LowLevelInterpreter.cpp)
else ()
    # As there's poor toolchain support for using `.file` directives in
    # inline asm (i.e. there's no way to avoid clashes with the `.file`

    # an object file. We only need to do this for LowLevelInterpreter.cpp
    # and cmake doesn't allow us to introduce a compiler wrapper for a
    # single source file, so we need to create a separate target for it.
    add_library(LowLevelInterpreterLib STATIC llint/LowLevelInterpreter.cpp
        ${JavaScriptCore_DERIVED_SOURCES_DIR}/${LLIntOutput})
endif ()


        COMPILE_OPTIONS "-fno-lto")
endif ()

list(APPEND JavaScriptCore_PRIVATE_LIBRARIES LowLevelInterpreterLib)
# lowlevelinterpreter lib objects get propogated.
if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "OBJECT")
    list(APPEND JavaScriptCore_PRIVATE_LIBRARIES $<TARGET_OBJECTS:LowLevelInterpreterLib>)
else ()
    list(APPEND JavaScriptCore_SOURCES $<TARGET_OBJECTS:LowLevelInterpreterLib>)
endif ()

WEBKIT_COMPUTE_SOURCES(JavaScriptCore)
WEBKIT_FRAMEWORK(JavaScriptCore)

Lines 26-31 set(WebKitTestRunner_FRAMEWORKS a/Tools/WebKitTestRunner/CMakeLists.txt_sec1
- a/Tools/WebKitTestRunner/CMakeLists.txt +1 lines
26	JavaScriptCore	26	JavaScriptCore
27	WebCore	27	WebCore
28	WebCoreTestSupport	28	WebCoreTestSupport
		29	WebKit
29	)	30	)
30		31
31	if (COMPILER_IS_GCC_OR_CLANG)	32	if (COMPILER_IS_GCC_OR_CLANG)



    GTK::GTK
)

list(APPEND WebKitTestRunner_FRAMEWORKS
    WebKit
)

list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
    InjectedBundle/atspi/AccessibilityControllerAtspi.cpp
    InjectedBundle/atspi/AccessibilityNotificationHandler.cpp



    Oleacc
)

list(APPEND WebKitTestRunner_FRAMEWORKS
    WebKit
)

list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES
    $<TARGET_OBJECTS:WebCoreTestSupport>
)
- 

Return to Bug 241002

Lines 463-469 if (MSVC AND NOT ENABLE_C_LOOP) a/Source/JavaScriptCore/CMakeLists.txt_sec1
- a/Source/JavaScriptCore/CMakeLists.txt -9 / +3 lines
463	COMMAND ${MASM_EXECUTABLE} ${LLINT_MASM_FLAGS} ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.asm	463	COMMAND ${MASM_EXECUTABLE} ${LLINT_MASM_FLAGS} ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.asm
464	VERBATIM)	464	VERBATIM)
465	list(APPEND JavaScriptCore_SOURCES ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj)	465	list(APPEND JavaScriptCore_SOURCES ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj)
466	add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp)	466	add_library(LowLevelInterpreterLib STATIC llint/LowLevelInterpreter.cpp)
467	else ()	467	else ()
468	# As there's poor toolchain support for using `.file` directives in	468	# As there's poor toolchain support for using `.file` directives in
469	# inline asm (i.e. there's no way to avoid clashes with the `.file`	469	# inline asm (i.e. there's no way to avoid clashes with the `.file`
Lines 472-478 else () a/Source/JavaScriptCore/CMakeLists.txt_sec2
472	# an object file. We only need to do this for LowLevelInterpreter.cpp	472	# an object file. We only need to do this for LowLevelInterpreter.cpp
473	# and cmake doesn't allow us to introduce a compiler wrapper for a	473	# and cmake doesn't allow us to introduce a compiler wrapper for a
474	# single source file, so we need to create a separate target for it.	474	# single source file, so we need to create a separate target for it.
475	add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp	475	add_library(LowLevelInterpreterLib STATIC llint/LowLevelInterpreter.cpp
476	${JavaScriptCore_DERIVED_SOURCES_DIR}/${LLIntOutput})	476	${JavaScriptCore_DERIVED_SOURCES_DIR}/${LLIntOutput})
477	endif ()	477	endif ()
478		478
Lines 1489-1501 if (CMAKE_COMPILER_IS_GNUCXX AND GCC_OFFLINEASM_SOURCE_MAP) a/Source/JavaScriptCore/CMakeLists.txt_sec3
1489	COMPILE_OPTIONS "-fno-lto")	1489	COMPILE_OPTIONS "-fno-lto")
1490	endif ()	1490	endif ()
1491		1491
1492	# When building JavaScriptCore as an object library, we need to make sure the	1492	list(APPEND JavaScriptCore_PRIVATE_LIBRARIES LowLevelInterpreterLib)
1493	# lowlevelinterpreter lib objects get propogated.
1494	if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "OBJECT")
1495	list(APPEND JavaScriptCore_PRIVATE_LIBRARIES $<TARGET_OBJECTS:LowLevelInterpreterLib>)
1496	else ()
1497	list(APPEND JavaScriptCore_SOURCES $<TARGET_OBJECTS:LowLevelInterpreterLib>)
1498	endif ()
1499		1493
1500	WEBKIT_COMPUTE_SOURCES(JavaScriptCore)	1494	WEBKIT_COMPUTE_SOURCES(JavaScriptCore)
1501	WEBKIT_FRAMEWORK(JavaScriptCore)	1495	WEBKIT_FRAMEWORK(JavaScriptCore)

Lines 33-42 list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES a/Tools/WebKitTestRunner/PlatformGTK.cmake_sec1
- a/Tools/WebKitTestRunner/PlatformGTK.cmake -4 lines
33	GTK::GTK	33	GTK::GTK
34	)	34	)
35		35
36	list(APPEND WebKitTestRunner_FRAMEWORKS
37	WebKit
38	)
39
40	list(APPEND WebKitTestRunnerInjectedBundle_SOURCES	36	list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
41	InjectedBundle/atspi/AccessibilityControllerAtspi.cpp	37	InjectedBundle/atspi/AccessibilityControllerAtspi.cpp
42	InjectedBundle/atspi/AccessibilityNotificationHandler.cpp	38	InjectedBundle/atspi/AccessibilityNotificationHandler.cpp

Lines 30-39 list(APPEND WebKitTestRunner_LIBRARIES a/Tools/WebKitTestRunner/PlatformWin.cmake_sec1
- a/Tools/WebKitTestRunner/PlatformWin.cmake -5 lines
30	Oleacc	30	Oleacc
31	)	31	)
32		32
33	list(APPEND WebKitTestRunner_FRAMEWORKS
34	WebKit
35	)
36
37	list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES	33	list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES
38	$<TARGET_OBJECTS:WebCoreTestSupport>	34	$<TARGET_OBJECTS:WebCoreTestSupport>
39	)	35	)
40	-