From 6882a04fb36642862b11efe514251d32070c3d65 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 25 Aug 2016 19:20:41 +0300 Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443) Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev --- Source/JavaScriptCore/PlatformQt.cmake | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 Source/JavaScriptCore/PlatformQt.cmake (limited to 'Source/JavaScriptCore/PlatformQt.cmake') diff --git a/Source/JavaScriptCore/PlatformQt.cmake b/Source/JavaScriptCore/PlatformQt.cmake new file mode 100644 index 000000000..7bc7f0348 --- /dev/null +++ b/Source/JavaScriptCore/PlatformQt.cmake @@ -0,0 +1,38 @@ +if (${JavaScriptCore_LIBRARY_TYPE} MATCHES STATIC) + add_definitions(-DSTATICALLY_LINKED_WITH_WTF) +endif () + +list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES + ${WTF_DIR} +) + +list(APPEND JavaScriptCore_SOURCES + API/JSStringRefQt.cpp +) + +list(APPEND JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES + ${Qt5Core_INCLUDE_DIRS} +) + +list(APPEND JavaScriptCore_LIBRARIES + ${Qt5Core_LIBRARIES} +) + +# From PlatformWin.cmake +if (WIN32) + list(REMOVE_ITEM JavaScriptCore_SOURCES + inspector/JSGlobalObjectInspectorController.cpp + ) + + file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore) + + set(JavaScriptCore_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore/preBuild.cmd") + file(REMOVE "${JavaScriptCore_PRE_BUILD_COMMAND}") + foreach (_directory ${JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES}) + file(APPEND "${JavaScriptCore_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${JAVASCRIPTCORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n") + endforeach () + + set(JavaScriptCore_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore/postBuild.cmd") + file(WRITE "${JavaScriptCore_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n") + file(APPEND "${JavaScriptCore_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/inspector/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n") +endif () -- cgit v1.2.1 From a0be5222b8695aed31664ab4e8e804632569ed64 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 30 Sep 2016 15:43:24 +0300 Subject: Imported WebKit commit 2730223e8fe1776419fae168986b9e77f55d02d3 Change-Id: I46d453477a779a8db544ffc50d088fa13331da9b Reviewed-by: Konstantin Tokarev --- Source/JavaScriptCore/PlatformQt.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Source/JavaScriptCore/PlatformQt.cmake') diff --git a/Source/JavaScriptCore/PlatformQt.cmake b/Source/JavaScriptCore/PlatformQt.cmake index 7bc7f0348..11587f401 100644 --- a/Source/JavaScriptCore/PlatformQt.cmake +++ b/Source/JavaScriptCore/PlatformQt.cmake @@ -18,6 +18,12 @@ list(APPEND JavaScriptCore_LIBRARIES ${Qt5Core_LIBRARIES} ) +if (QT_STATIC_BUILD) + list(APPEND JavaScriptCore_LIBRARIES + ${STATIC_LIB_DEPENDENCIES} + ) +endif () + # From PlatformWin.cmake if (WIN32) list(REMOVE_ITEM JavaScriptCore_SOURCES -- cgit v1.2.1 From b9e202b0f12f275d4aade98943df92bf67684f52 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 26 Dec 2016 00:24:34 +0300 Subject: Imported WebKit commit 12fbea815480c3b3fad139cd8dfb82e8c954bc9a Change-Id: Iccbb1e8bd8b7f72322614224c203fc509a8dbb79 Reviewed-by: Konstantin Tokarev --- Source/JavaScriptCore/PlatformQt.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Source/JavaScriptCore/PlatformQt.cmake') diff --git a/Source/JavaScriptCore/PlatformQt.cmake b/Source/JavaScriptCore/PlatformQt.cmake index 11587f401..057929139 100644 --- a/Source/JavaScriptCore/PlatformQt.cmake +++ b/Source/JavaScriptCore/PlatformQt.cmake @@ -29,7 +29,9 @@ if (WIN32) list(REMOVE_ITEM JavaScriptCore_SOURCES inspector/JSGlobalObjectInspectorController.cpp ) +endif () +if (MSVC) file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore) set(JavaScriptCore_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore/preBuild.cmd") -- cgit v1.2.1 From 46167faa61861b01a0e4e8e774da9febc3c2956e Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 9 Jan 2017 10:23:36 +0300 Subject: Imported WebKit commit 30997fb33975697a4af9cc6eef69967313d0ec9a Change-Id: I8a2348dd9eb59df840dde6b66141d562aff29bf4 Reviewed-by: Konstantin Tokarev --- Source/JavaScriptCore/PlatformQt.cmake | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'Source/JavaScriptCore/PlatformQt.cmake') diff --git a/Source/JavaScriptCore/PlatformQt.cmake b/Source/JavaScriptCore/PlatformQt.cmake index 057929139..34a372756 100644 --- a/Source/JavaScriptCore/PlatformQt.cmake +++ b/Source/JavaScriptCore/PlatformQt.cmake @@ -30,17 +30,3 @@ if (WIN32) inspector/JSGlobalObjectInspectorController.cpp ) endif () - -if (MSVC) - file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore) - - set(JavaScriptCore_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore/preBuild.cmd") - file(REMOVE "${JavaScriptCore_PRE_BUILD_COMMAND}") - foreach (_directory ${JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES}) - file(APPEND "${JavaScriptCore_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${JAVASCRIPTCORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n") - endforeach () - - set(JavaScriptCore_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore/postBuild.cmd") - file(WRITE "${JavaScriptCore_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n") - file(APPEND "${JavaScriptCore_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/inspector/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n") -endif () -- cgit v1.2.1