[GTK] Allow gtk-doc and introspection in cross builds
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 18 May 2020 16:20:08 +0000 (16:20 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 18 May 2020 16:20:08 +0000 (16:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=212026

Patch by Michael Catanzaro <mcatanzaro@gnome.org> on 2020-05-18
Reviewed by Adrian Perez de Castro.

Stop disabling these options in cross builds.

* Source/cmake/OptionsGTK.cmake:

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

ChangeLog
Source/cmake/OptionsGTK.cmake

index 6b4084d..2629e25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2020-05-18  Michael Catanzaro  <mcatanzaro@gnome.org>
+
+        [GTK] Allow gtk-doc and introspection in cross builds
+        https://bugs.webkit.org/show_bug.cgi?id=212026
+
+        Reviewed by Adrian Perez de Castro.
+
+        Stop disabling these options in cross builds.
+
+        * Source/cmake/OptionsGTK.cmake:
+
 2020-05-18  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.29.1 release
index b0af978..1b0bb53 100644 (file)
@@ -425,12 +425,6 @@ if (ENABLED_COMPILER_SANITIZERS)
     set(ENABLE_INTROSPECTION OFF)
 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 ()
-
 # Override the cached variable, gtk-doc does not really work when building on Mac.
 if (APPLE)
     set(ENABLE_GTKDOC OFF)