[cmake] REGRESSION(182663): It broke feature dependency handling
authormcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 13 Apr 2015 17:42:22 +0000 (17:42 +0000)
committermcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 13 Apr 2015 17:42:22 +0000 (17:42 +0000)
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:

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

ChangeLog
Source/cmake/WebKitFeatures.cmake

index 4a8509d..b714341 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+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>
 
         [cmake] Add ENABLE(ATTACHMENT_ELEMENT) to the build system
index 84c8dcd..f747dc8 100644 (file)
@@ -177,6 +177,11 @@ macro(WEBKIT_OPTION_END)
             set(_MAX_FEATURE_LENGTH ${_NAME_LENGTH})
         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}}})
                 message(STATUS "Disabling ${_name} since ${_WEBKIT_AVAILABLE_OPTIONS_DEPENDENCY_OF_${_name}} support is disabled.")
@@ -184,11 +189,6 @@ macro(WEBKIT_OPTION_END)
             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 ()
-
         if (${_name})
             list(APPEND FEATURE_DEFINES ${_name})
             set(FEATURE_DEFINES_WITH_SPACE_SEPARATOR "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR} ${_name}")