Title: [285734] trunk
- Revision
- 285734
- Author
- [email protected]
- Date
- 2021-11-12 11:50:24 -0800 (Fri, 12 Nov 2021)
Log 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:
Modified Paths
Diff
Modified: trunk/ChangeLog (285733 => 285734)
--- trunk/ChangeLog 2021-11-12 19:13:03 UTC (rev 285733)
+++ trunk/ChangeLog 2021-11-12 19:50:24 UTC (rev 285734)
@@ -1,3 +1,14 @@
+2021-11-12 Don Olmstead <[email protected]>
+
+ [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 <[email protected]>
-Warray-bounds, -Wstringop-truncation, -Wstringop-overread warnings in Packed.h
Modified: trunk/Source/WebCore/CMakeLists.txt (285733 => 285734)
--- trunk/Source/WebCore/CMakeLists.txt 2021-11-12 19:13:03 UTC (rev 285733)
+++ trunk/Source/WebCore/CMakeLists.txt 2021-11-12 19:50:24 UTC (rev 285734)
@@ -1936,6 +1936,10 @@
)
endif ()
+if (USE_LCMS)
+ list(APPEND WebCore_LIBRARIES LCMS2::LCMS2)
+endif ()
+
if (USE_WOFF2)
list(APPEND WebCore_LIBRARIES WOFF2::dec)
endif ()
Modified: trunk/Source/WebCore/ChangeLog (285733 => 285734)
--- trunk/Source/WebCore/ChangeLog 2021-11-12 19:13:03 UTC (rev 285733)
+++ trunk/Source/WebCore/ChangeLog 2021-11-12 19:50:24 UTC (rev 285734)
@@ -1,3 +1,16 @@
+2021-11-12 Don Olmstead <[email protected]>
+
+ [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 <[email protected]>
Null check host in SlotAssignment::assignSlots
Modified: trunk/Source/WebCore/PlatformGTK.cmake (285733 => 285734)
--- trunk/Source/WebCore/PlatformGTK.cmake 2021-11-12 19:13:03 UTC (rev 285733)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2021-11-12 19:50:24 UTC (rev 285734)
@@ -103,12 +103,6 @@
GTK::GTK
)
-if (USE_LCMS)
- list(APPEND WebCore_LIBRARIES
- LCMS2::LCMS2
- )
-endif ()
-
if (USE_WPE_RENDERER)
list(APPEND WebCore_LIBRARIES
WPE::libwpe
Modified: trunk/Source/WebCore/PlatformWPE.cmake (285733 => 285734)
--- trunk/Source/WebCore/PlatformWPE.cmake 2021-11-12 19:13:03 UTC (rev 285733)
+++ trunk/Source/WebCore/PlatformWPE.cmake 2021-11-12 19:50:24 UTC (rev 285734)
@@ -76,12 +76,6 @@
${UPOWERGLIB_INCLUDE_DIRS}
)
-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})
list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES ${WPE_INCLUDE_DIRS})
Modified: trunk/Source/cmake/OptionsWinCairo.cmake (285733 => 285734)
--- trunk/Source/cmake/OptionsWinCairo.cmake 2021-11-12 19:13:03 UTC (rev 285733)
+++ trunk/Source/cmake/OptionsWinCairo.cmake 2021-11-12 19:50:24 UTC (rev 285734)
@@ -21,6 +21,11 @@
endif ()
# 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)
SET_AND_EXPOSE_TO_BUILD(USE_OPENJPEG ON)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
