Changeset 182740 in webkit

Timestamp:

Apr 13, 2015, 10:42:22 AM (10 years ago)

Author:

Michael Catanzaro

Message:

[cmake] REGRESSION(182663): It broke feature dependency handling
​https://bugs.webkit.org/show_bug.cgi?id=143665

Reviewed by Csaba Osztrogonác.

Don't try to check the value of options before defining the options.

• Source/cmake/WebKitFeatures.cmake:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/WebKitFeatures.cmake (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2015-04-13  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [cmake] REGRESSION(182663): It broke feature dependency handling
+        https://bugs.webkit.org/show_bug.cgi?id=143665
+
+        Reviewed by Csaba Osztrogonác.
+
+        Don't try to check the value of options before defining the options.
+
+        * Source/cmake/WebKitFeatures.cmake:
+
 2015-04-13  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/cmake/WebKitFeatures.cmake

@@ -178 +178 @@
         endif ()
 
+        option(${_name} "${_WEBKIT_AVAILABLE_OPTIONS_DESCRIPTION_${_name}}" ${_WEBKIT_AVAILABLE_OPTIONS_INITIAL_VALUE_${_name}})
+        if (NOT _WEBKIT_AVAILABLE_OPTIONS_IS_PUBLIC_${_name})
+            mark_as_advanced(FORCE ${_name})
+        endif ()
+
         if (${_name} AND DEFINED _WEBKIT_AVAILABLE_OPTIONS_DEPENDENCY_OF_${_name})
             if (NOT ${${_WEBKIT_AVAILABLE_OPTIONS_DEPENDENCY_OF_${_name}}})
@@ -183 +188 @@
                 set(${_name} OFF)
             endif ()
-        endif ()
-
-        option(${_name} "${_WEBKIT_AVAILABLE_OPTIONS_DESCRIPTION_${_name}}" ${_WEBKIT_AVAILABLE_OPTIONS_INITIAL_VALUE_${_name}})
-        if (NOT _WEBKIT_AVAILABLE_OPTIONS_IS_PUBLIC_${_name})
-            mark_as_advanced(FORCE ${_name})
         endif ()