Title: [239383] trunk
- Revision
- 239383
- Author
- ape...@igalia.com
- Date
- 2018-12-19 11:58:21 -0800 (Wed, 19 Dec 2018)
Log Message
[GTK] Cannot build with CMake <3.7
https://bugs.webkit.org/show_bug.cgi?id=192865
Reviewed by Michael Catanzaro.
* Source/cmake/OptionsGTK.cmake: Convert usage of VERSION_GREATER_EQUAL to a
combination of VERSION_GREATER + STREQUAL.
Modified Paths
Diff
Modified: trunk/ChangeLog (239382 => 239383)
--- trunk/ChangeLog 2018-12-19 19:26:24 UTC (rev 239382)
+++ trunk/ChangeLog 2018-12-19 19:58:21 UTC (rev 239383)
@@ -1,3 +1,13 @@
+2018-12-19 Adrian Perez de Castro <ape...@igalia.com>
+
+ [GTK] Cannot build with CMake <3.7
+ https://bugs.webkit.org/show_bug.cgi?id=192865
+
+ Reviewed by Michael Catanzaro.
+
+ * Source/cmake/OptionsGTK.cmake: Convert usage of VERSION_GREATER_EQUAL to a
+ combination of VERSION_GREATER + STREQUAL.
+
2018-12-19 Lucas Stach <l.st...@pengutronix.de>
Fix build on 64bit ARM with arm64 SYSTEM_PROCESSOR
Modified: trunk/Source/cmake/OptionsGTK.cmake (239382 => 239383)
--- trunk/Source/cmake/OptionsGTK.cmake 2018-12-19 19:26:24 UTC (rev 239382)
+++ trunk/Source/cmake/OptionsGTK.cmake 2018-12-19 19:58:21 UTC (rev 239383)
@@ -126,10 +126,10 @@
endif ()
# Enable variation fonts when cairo >= 1.16, fontconfig >= 2.13.0, freetype >= 2.9.0 and harfbuzz >= 1.4.2.
-if ("${PC_CAIRO_VERSION}" VERSION_GREATER_EQUAL "1.16.0"
- AND "${PC_FONTCONFIG_VERSION}" VERSION_GREATER_EQUAL "2.13.0"
- AND "${FREETYPE_VERSION_STRING}" VERSION_GREATER_EQUAL "2.9.0"
- AND "${PC_HARFBUZZ_VERSION}" VERSION_GREATER_EQUAL "1.4.2")
+if (("${PC_CAIRO_VERSION}" VERSION_GREATER "1.16.0" OR "${PC_CAIRO_VERSION}" STREQUAL "1.16.0")
+ AND ("${PC_FONTCONFIG_VERSION}" VERSION_GREATER "2.13.0" OR "${PC_FONTCONFIG_VERSION}" STREQUAL "2.13.0")
+ AND ("${FREETYPE_VERSION_STRING}" VERSION_GREATER "2.9.0" OR "${FREETYPE_VERSION_STRING}" STREQUAL "2.9.0")
+ AND ("${PC_HARFBUZZ_VERSION}" VERSION_GREATER "1.4.2" OR "${PC_HARFBUZZ_VERSION}" STREQUAL "1.4.2"))
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE ON)
endif ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
