Title: [207959] releases/WebKitGTK/webkit-2.14
Revision
207959
Author
carlo...@webkit.org
Date
2016-10-27 01:30:54 -0700 (Thu, 27 Oct 2016)

Log Message

Merge r207351 - [CMake] Private/unsupported build options should be marked as advanced
https://bugs.webkit.org/show_bug.cgi?id=163451

Reviewed by Carlos Garcia Campos.

When checking to decide whether to mark an option as advanced, the conditional checks
whether _WEBKIT_AVAILABLE_OPTIONS_IS_PUBLIC_${_name} is defined. It is always defined. We
need to check its value instead.

* Source/cmake/WebKitFeatures.cmake:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.14/ChangeLog (207958 => 207959)


--- releases/WebKitGTK/webkit-2.14/ChangeLog	2016-10-27 08:27:20 UTC (rev 207958)
+++ releases/WebKitGTK/webkit-2.14/ChangeLog	2016-10-27 08:30:54 UTC (rev 207959)
@@ -1,3 +1,16 @@
+2016-10-14  Michael Catanzaro  <mcatanz...@igalia.com>
+
+        [CMake] Private/unsupported build options should be marked as advanced
+        https://bugs.webkit.org/show_bug.cgi?id=163451
+
+        Reviewed by Carlos Garcia Campos.
+
+        When checking to decide whether to mark an option as advanced, the conditional checks
+        whether _WEBKIT_AVAILABLE_OPTIONS_IS_PUBLIC_${_name} is defined. It is always defined. We
+        need to check its value instead.
+
+        * Source/cmake/WebKitFeatures.cmake:
+
 2016-10-11  Carlos Garcia Campos  <cgar...@igalia.com>
 
         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.14.1 release.

Modified: releases/WebKitGTK/webkit-2.14/Source/cmake/WebKitFeatures.cmake (207958 => 207959)


--- releases/WebKitGTK/webkit-2.14/Source/cmake/WebKitFeatures.cmake	2016-10-27 08:27:20 UTC (rev 207958)
+++ releases/WebKitGTK/webkit-2.14/Source/cmake/WebKitFeatures.cmake	2016-10-27 08:30:54 UTC (rev 207959)
@@ -268,7 +268,7 @@
         endif ()
 
         option(${_name} "${_WEBKIT_AVAILABLE_OPTIONS_DESCRIPTION_${_name}}" ${_WEBKIT_AVAILABLE_OPTIONS_INITIAL_VALUE_${_name}})
-        if (NOT _WEBKIT_AVAILABLE_OPTIONS_IS_PUBLIC_${_name})
+        if (NOT ${_WEBKIT_AVAILABLE_OPTIONS_IS_PUBLIC_${_name}})
             mark_as_advanced(FORCE ${_name})
         endif ()
     endforeach ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to