[GTK] Forcefully disable gtk-doc and gobject-introspection when crossbuilding
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 3 Jul 2015 15:14:09 +0000 (15:14 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 3 Jul 2015 15:14:09 +0000 (15:14 +0000)
https://bugs.webkit.org/show_bug.cgi?id=146590

Patch by Emanuele Aina <emanuele.aina@collabora.com> on 2015-07-03
Reviewed by Martin Robinson.

* Source/PlatformGTK.cmake: override the cached variables to
forcefully disable gtk-doc and gobject-introspection when
crosscompiling.
* Source/cmake/OptionsGTK.cmake: avoid running gtk-doc to check the
documentation syntax when cross-building.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@186259 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/PlatformGTK.cmake
Source/cmake/OptionsGTK.cmake

index 469add5..95d9233 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2015-07-03  Emanuele Aina  <emanuele.aina@collabora.com>
+
+        [GTK] Forcefully disable gtk-doc and gobject-introspection when crossbuilding
+        https://bugs.webkit.org/show_bug.cgi?id=146590
+
+        Reviewed by Martin Robinson.
+
+        * Source/PlatformGTK.cmake: override the cached variables to
+        forcefully disable gtk-doc and gobject-introspection when
+        crosscompiling.
+        * Source/cmake/OptionsGTK.cmake: avoid running gtk-doc to check the
+        documentation syntax when cross-building.
+
+
 2015-07-02  Przemek Piorkowski  <piorkowskiprzemyslaw@gmail.com>
 
         [EFL] test_ewk2_application_cache_manager has been failed since r185527
index 42b1874..0b11b56 100644 (file)
@@ -34,7 +34,7 @@ endmacro()
 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)
+elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING)
     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
index f2c87c4..e2b248a 100644 (file)
@@ -433,6 +433,12 @@ if (USE_LIBHYPHEN)
     endif ()
 endif ()
 
+# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building.
+if (CMAKE_CROSSCOMPILING)
+    set(ENABLE_GTKDOC OFF)
+    set(ENABLE_INTROSPECTION OFF)
+endif ()
+
 set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
 set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
 set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)