Title: [194443] trunk
- Revision
- 194443
- Author
- [email protected]
- Date
- 2015-12-30 00:31:15 -0800 (Wed, 30 Dec 2015)
Log Message
[GTK][Mac] Disable gtk-doc
https://bugs.webkit.org/show_bug.cgi?id=150798
Reviewed by Michael Catanzaro.
* Source/PlatformGTK.cmake: gtkdoc-scangobj fails due to a clang
link error on Mac, so for now disable gtk-doc support on that
platform.
* Source/cmake/OptionsGTK.cmake: Ditto.
Modified Paths
Diff
Modified: trunk/ChangeLog (194442 => 194443)
--- trunk/ChangeLog 2015-12-30 05:02:31 UTC (rev 194442)
+++ trunk/ChangeLog 2015-12-30 08:31:15 UTC (rev 194443)
@@ -1,3 +1,15 @@
+2015-12-30 Philippe Normand <[email protected]>
+
+ [GTK][Mac] Disable gtk-doc
+ https://bugs.webkit.org/show_bug.cgi?id=150798
+
+ Reviewed by Michael Catanzaro.
+
+ * Source/PlatformGTK.cmake: gtkdoc-scangobj fails due to a clang
+ link error on Mac, so for now disable gtk-doc support on that
+ platform.
+ * Source/cmake/OptionsGTK.cmake: Ditto.
+
2015-12-23 Andy VanWagoner <[email protected]>
[INTL] Implement Intl.DateTimeFormat.prototype.resolvedOptions ()
Modified: trunk/Source/PlatformGTK.cmake (194442 => 194443)
--- trunk/Source/PlatformGTK.cmake 2015-12-30 05:02:31 UTC (rev 194442)
+++ trunk/Source/PlatformGTK.cmake 2015-12-30 08:31:15 UTC (rev 194443)
@@ -34,7 +34,7 @@
add_gtkdoc_generator("docs-build.stamp" "")
if (ENABLE_GTKDOC)
add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
-elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING)
+elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING AND NOT APPLE)
add_custom_target(gtkdoc DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
# Add a default build step which check that documentation does not have any warnings
Modified: trunk/Source/cmake/OptionsGTK.cmake (194442 => 194443)
--- trunk/Source/cmake/OptionsGTK.cmake 2015-12-30 05:02:31 UTC (rev 194442)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-12-30 08:31:15 UTC (rev 194443)
@@ -453,8 +453,8 @@
endif ()
endif ()
-# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building.
-if (CMAKE_CROSSCOMPILING)
+# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building or when building on Mac.
+if (CMAKE_CROSSCOMPILING OR APPLE)
set(ENABLE_GTKDOC OFF)
set(ENABLE_INTROSPECTION OFF)
endif ()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
