Changeset 285734 in webkit

Timestamp:

Nov 12, 2021, 11:50:24 AM (5 years ago)

Author:

don.olmstead@sony.com

Message:

[WinCairo] Add Little-CMS support
​https://bugs.webkit.org/show_bug.cgi?id=233024

Reviewed by Michael Catanzaro.

.:

Search for LCMS2 and if its present turn it on for WinCairo.

• Source/cmake/OptionsWinCairo.cmake:

Source/WebCore:

Centralize addition of LCMS2::LCMS2 to the root CMakeLists in WebCore.

• CMakeLists.txt:
• PlatformGTK.cmake:
• PlatformWPE.cmake:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebCore/CMakeLists.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/PlatformGTK.cmake (modified) (1 diff)
• Source/WebCore/PlatformWPE.cmake (modified) (1 diff)
• Source/cmake/OptionsWinCairo.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2021-11-12  Don Olmstead  <don.olmstead@sony.com>
+
+        [WinCairo] Add Little-CMS support
+        https://bugs.webkit.org/show_bug.cgi?id=233024
+
+        Reviewed by Michael Catanzaro.
+
+        Search for LCMS2 and if its present turn it on for WinCairo.
+
+        * Source/cmake/OptionsWinCairo.cmake:
+
 2021-11-11  Michael Catanzaro  <mcatanzaro@gnome.org>
 

trunk/Source/WebCore/CMakeLists.txt

@@ -1937 +1937 @@
 endif ()
 
+if (USE_LCMS)
+    list(APPEND WebCore_LIBRARIES LCMS2::LCMS2)
+endif ()
+
 if (USE_WOFF2)
   list(APPEND WebCore_LIBRARIES WOFF2::dec)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-12  Don Olmstead  <don.olmstead@sony.com>
+
+        [WinCairo] Add Little-CMS support
+        https://bugs.webkit.org/show_bug.cgi?id=233024
+
+        Reviewed by Michael Catanzaro.
+
+        Centralize addition of LCMS2::LCMS2 to the root CMakeLists in WebCore.
+
+        * CMakeLists.txt:
+        * PlatformGTK.cmake:
+        * PlatformWPE.cmake:
+
 2021-11-12  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/PlatformGTK.cmake

@@ -104 +104 @@
 )
 
-if (USE_LCMS)
-    list(APPEND WebCore_LIBRARIES
-        LCMS2::LCMS2
-    )
-endif ()
-
 if (USE_WPE_RENDERER)
     list(APPEND WebCore_LIBRARIES

trunk/Source/WebCore/PlatformWPE.cmake

@@ -77 +77 @@
 )
 
-if (USE_LCMS)
-    list(APPEND WebCore_LIBRARIES
-        LCMS2::LCMS2
-    )
-endif ()
-
 if (USE_WPE_VIDEO_PLANE_DISPLAY_DMABUF OR USE_WPEBACKEND_FDO_AUDIO_EXTENSION)
     list(APPEND WebCore_LIBRARIES ${WPEBACKEND_FDO_LIBRARIES})

trunk/Source/cmake/OptionsWinCairo.cmake

@@ -22 +22 @@
 
 # Optional packages
+find_package(LCMS2)
+if (LCMS2_FOUND)
+    SET_AND_EXPOSE_TO_BUILD(USE_LCMS ON)
+endif ()
+
 find_package(OpenJPEG 2.3.1)
 if (OpenJPEG_FOUND)