Attachment 371200 Details for Bug 198490 – Patch

[patch] Patch

bug-198490.diff (text/plain), 4.44 KB, created by Don Olmstead on 2019-06-03 11:48:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2019-06-03 11:48:44 PDT

Size: 4.44 KB

patch

obsolete

>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index b2854a67762..a0521ef65f1 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,21 @@
>+2019-06-03  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Use WEBKIT_EXECUTABLE in ImageDiff
>+        https://bugs.webkit.org/show_bug.cgi?id=198490
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Use WEBKIT_EXECUTABLE in ImageDiff. Change CMake variables to use the proper
>+        convention. Add a shared CoreGraphics.cmake instead of just including PlatformMac
>+        for AppleWin builds.
>+
>+        * ImageDiff/CMakeLists.txt:
>+        * ImageDiff/Cairo.cmake:
>+        * ImageDiff/CoreGraphics.cmake: Added.
>+        * ImageDiff/PlatformGTK.cmake:
>+        * ImageDiff/PlatformMac.cmake:
>+        * ImageDiff/PlatformWin.cmake:
>+
> 2019-06-03  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake] Add WebKit::JavaScriptCore target
>diff --git a/Tools/ImageDiff/CMakeLists.txt b/Tools/ImageDiff/CMakeLists.txt
>index 9c58cc55513..93831cd6d47 100644
>--- a/Tools/ImageDiff/CMakeLists.txt
>+++ b/Tools/ImageDiff/CMakeLists.txt
>@@ -1,23 +1,14 @@
> set(IMAGE_DIFF_DIR "${TOOLS_DIR}/ImageDiff")
> 
>-set(IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES "")
>-
>-set(IMAGE_DIFF_SOURCES
>-    ${IMAGE_DIFF_DIR}/ImageDiff.cpp
>-    ${IMAGE_DIFF_DIR}/PlatformImage.cpp
>+set(ImageDiff_SOURCES
>+    ImageDiff.cpp
>+    PlatformImage.cpp
> )
> 
>-set(IMAGE_DIFF_INCLUDE_DIRECTORIES
>+set(ImageDiff_PRIVATE_INCLUDE_DIRECTORIES
>     ${IMAGE_DIFF_DIR}
> )
> 
>+WEBKIT_EXECUTABLE_DECLARE(ImageDiff)
> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
>-
>-include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES})
>-include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
>-add_executable(ImageDiff ${IMAGE_DIFF_SOURCES})
>-target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES})
>-
>-if (WIN32)
>-    add_dependencies(ImageDiff ImageDiffLib)
>-endif ()
>+WEBKIT_EXECUTABLE(ImageDiff)
>diff --git a/Tools/ImageDiff/Cairo.cmake b/Tools/ImageDiff/Cairo.cmake
>index fde8c09308e..66c34d6cf5c 100644
>--- a/Tools/ImageDiff/Cairo.cmake
>+++ b/Tools/ImageDiff/Cairo.cmake
>@@ -1,13 +1,13 @@
>-list(APPEND IMAGE_DIFF_SOURCES
>-    ${IMAGE_DIFF_DIR}/cairo/PlatformImageCairo.cpp
>+list(APPEND ImageDiff_SOURCES
>+    cairo/PlatformImageCairo.cpp
> )
> 
>-list(APPEND IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES
>+list(APPEND ImageDiff_SYSTEM_INCLUDE_DIRECTORIES
>     ${CAIRO_INCLUDE_DIRS}
> )
> 
>-list(APPEND IMAGE_DIFF_LIBRARIES
>+list(APPEND ImageDiff_LIBRARIES
>     ${CAIRO_LIBRARIES}
> )
> 
>-add_definitions(-DUSE_CAIRO=1)
>+list(APPEND ImageDiff_PRIVATE_DEFINITIONS USE_CAIRO=1)
>diff --git a/Tools/ImageDiff/CoreGraphics.cmake b/Tools/ImageDiff/CoreGraphics.cmake
>new file mode 100644
>index 00000000000..a8d5e07c818
>--- /dev/null
>+++ b/Tools/ImageDiff/CoreGraphics.cmake
>@@ -0,0 +1,9 @@
>+list(APPEND ImageDiff_SOURCES
>+    cg/PlatformImageCG.cpp
>+)
>+
>+list(APPEND ImageDiff_LIBRARIES
>+    CoreFoundation
>+    CoreGraphics
>+    CoreText
>+)
>diff --git a/Tools/ImageDiff/PlatformGTK.cmake b/Tools/ImageDiff/PlatformGTK.cmake
>index c4dce0072ff..4b0ee5328ba 100644
>--- a/Tools/ImageDiff/PlatformGTK.cmake
>+++ b/Tools/ImageDiff/PlatformGTK.cmake
>@@ -1,2 +1 @@
> include(Cairo.cmake)
>-
>diff --git a/Tools/ImageDiff/PlatformMac.cmake b/Tools/ImageDiff/PlatformMac.cmake
>index bd6c00035f4..aa3d6573442 100644
>--- a/Tools/ImageDiff/PlatformMac.cmake
>+++ b/Tools/ImageDiff/PlatformMac.cmake
>@@ -1,8 +1 @@
>-list(APPEND IMAGE_DIFF_SOURCES
>-    ${IMAGE_DIFF_DIR}/cg/PlatformImageCG.cpp
>-)
>-list(APPEND IMAGE_DIFF_LIBRARIES
>-    CoreFoundation
>-    CoreGraphics
>-    CoreText
>-)
>+include(CoreGraphics.cmake)
>diff --git a/Tools/ImageDiff/PlatformWin.cmake b/Tools/ImageDiff/PlatformWin.cmake
>index 08d49f7596a..d7b7d3435de 100644
>--- a/Tools/ImageDiff/PlatformWin.cmake
>+++ b/Tools/ImageDiff/PlatformWin.cmake
>@@ -1,15 +1,15 @@
>+set(wrapper_DEFINITIONS USE_CONSOLE_ENTRY_POINT)
>+
> if (${WTF_PLATFORM_WIN_CAIRO})
>-    add_definitions(-DWIN_CAIRO)
>+    list(APPEND wrapper_DEFINITIONS WIN_CAIRO)
> 
>     include(Cairo.cmake)
> else ()
>-    include(PlatformMac.cmake)
>+    include(CoreGraphics.cmake)
> endif ()
> 
>-add_library(ImageDiffLib SHARED ${IMAGE_DIFF_SOURCES})
>-target_link_libraries(ImageDiffLib ${IMAGE_DIFF_LIBRARIES})
>-
>-add_definitions(-DUSE_CONSOLE_ENTRY_POINT)
>-
>-set(IMAGE_DIFF_SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp)
>-set(IMAGE_DIFF_LIBRARIES shlwapi)
>+WEBKIT_WRAP_EXECUTABLE(ImageDiff
>+    SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
>+    LIBRARIES shlwapi
>+)
>+target_compile_definitions(ImageDiff PRIVATE ${wrapper_DEFINITIONS})

Actions: View | Formatted Diff | Diff

Attachments on bug 198490: 371200