Title: [274685] trunk/Source/WebCore
- Revision
- 274685
- Author
- dp...@igalia.com
- Date
- 2021-03-18 16:38:16 -0700 (Thu, 18 Mar 2021)
Log Message
[GTK][WPE][CMake] libCMS2 should be included only if guard USE_LCMS is defined
https://bugs.webkit.org/show_bug.cgi?id=223340
Reviewed by Carlos Garcia Campos.
* PlatformGTK.cmake:
* PlatformWPE.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (274684 => 274685)
--- trunk/Source/WebCore/ChangeLog 2021-03-18 23:29:06 UTC (rev 274684)
+++ trunk/Source/WebCore/ChangeLog 2021-03-18 23:38:16 UTC (rev 274685)
@@ -1,3 +1,13 @@
+2021-03-18 Diego Pino Garcia <dp...@igalia.com>
+
+ [GTK][WPE][CMake] libCMS2 should be included only if guard USE_LCMS is defined
+ https://bugs.webkit.org/show_bug.cgi?id=223340
+
+ Reviewed by Carlos Garcia Campos.
+
+ * PlatformGTK.cmake:
+ * PlatformWPE.cmake:
+
2021-03-18 Simon Fraser <simon.fra...@apple.com>
Don't spend time painting transparent cell backgrounds
Modified: trunk/Source/WebCore/PlatformGTK.cmake (274684 => 274685)
--- trunk/Source/WebCore/PlatformGTK.cmake 2021-03-18 23:29:06 UTC (rev 274684)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2021-03-18 23:38:16 UTC (rev 274685)
@@ -93,7 +93,6 @@
${GLIB_GMODULE_LIBRARIES}
${GLIB_GOBJECT_LIBRARIES}
${GLIB_LIBRARIES}
- ${LCMS2_LIBRARIES}
${LIBSECRET_LIBRARIES}
${LIBTASN1_LIBRARIES}
${HYPHEN_LIBRARIES}
@@ -106,6 +105,12 @@
GTK::GTK
)
+if (USE_LCMS)
+ list(APPEND WebCore_LIBRARIES
+ ${LCMS2_LIBRARIES}
+ )
+endif ()
+
if (USE_WPE_RENDERER)
list(APPEND WebCore_LIBRARIES
WPE::libwpe
@@ -117,12 +122,17 @@
${ENCHANT_INCLUDE_DIRS}
${GIO_UNIX_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
- ${LCMS2_INCLUDE_DIR}
${LIBSECRET_INCLUDE_DIRS}
${LIBTASN1_INCLUDE_DIRS}
${UPOWERGLIB_INCLUDE_DIRS}
)
+if (USE_LCMS)
+ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
+ ${LCMS2_INCLUDE_DIR}
+ )
+endif ()
+
if (USE_OPENGL)
list(APPEND WebCore_SOURCES
platform/graphics/OpenGLShims.cpp
Modified: trunk/Source/WebCore/PlatformWPE.cmake (274684 => 274685)
--- trunk/Source/WebCore/PlatformWPE.cmake 2021-03-18 23:29:06 UTC (rev 274684)
+++ trunk/Source/WebCore/PlatformWPE.cmake 2021-03-18 23:38:16 UTC (rev 274685)
@@ -58,20 +58,30 @@
${GLIB_GMODULE_LIBRARIES}
${GLIB_GOBJECT_LIBRARIES}
${GLIB_LIBRARIES}
- ${LCMS2_LIBRARIES}
${LIBTASN1_LIBRARIES}
${UPOWERGLIB_LIBRARIES}
)
+if (USE_LCMS)
+ list(APPEND WebCore_LIBRARIES
+ ${LCMS2_LIBRARIES}
+ )
+endif ()
+
list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
${ATK_INCLUDE_DIRS}
${GIO_UNIX_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
- ${LCMS2_INCLUDE_DIR}
${LIBTASN1_INCLUDE_DIRS}
${UPOWERGLIB_INCLUDE_DIRS}
)
+if (USE_LCMS)
+ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
+ ${LCMS2_INCLUDE_DIR}
+ )
+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})
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
