Changeset 182663 in webkit

Timestamp:

Apr 11, 2015 2:28:34 PM (9 years ago)

Author:

Michael Catanzaro

Message:

[CMake] Print sorted feature list at the very end of the configure process
​https://bugs.webkit.org/show_bug.cgi?id=143596

Reviewed by Martin Robinson.

• CMakeLists.txt: Call PRINT_WEBKIT_OPTIONS at the bottom of the file.
• Source/cmake/WebKitFeatures.cmake: Split option printing into PRINT_WEBKIT_OPTIONS macro,

and sort the options before printing. Reorder some code so that features still get
propagated to the bindings generators.

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• Source/cmake/WebKitFeatures.cmake (modified) (3 diffs)

trunk/CMakeLists.txt

@@ -179 +179 @@
     add_subdirectory(Tools)
 endif ()
+
+# -----------------------------------------------------------------------------
+# Print the features list last, for maximum visibility.
+# -----------------------------------------------------------------------------
+PRINT_WEBKIT_OPTIONS()

trunk/ChangeLog

@@ +1 @@
+2015-04-11  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [CMake] Print sorted feature list at the very end of the configure process
+        https://bugs.webkit.org/show_bug.cgi?id=143596
+
+        Reviewed by Martin Robinson.
+
+        * CMakeLists.txt: Call PRINT_WEBKIT_OPTIONS at the bottom of the file.
+        * Source/cmake/WebKitFeatures.cmake: Split option printing into PRINT_WEBKIT_OPTIONS macro,
+        and sort the options before printing. Reorder some code so that features still get
+        propagated to the bindings generators.
+
 2015-04-11  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/cmake/WebKitFeatures.cmake

@@ -169 +169 @@
 
 macro(WEBKIT_OPTION_END)
-    foreach (_name ${_WEBKIT_AVAILABLE_OPTIONS})
-        option(${_name} "${_WEBKIT_AVAILABLE_OPTIONS_DESCRIPTION_${_name}}" ${_WEBKIT_AVAILABLE_OPTIONS_INITIALVALUE_${_name}})
-        if (NOT _WEBKIT_AVAILABLE_OPTIONS_ISPUBLIC_${_name})
-            mark_as_advanced(FORCE ${_name})
-        endif ()
-    endforeach ()
-
+    list(SORT _WEBKIT_AVAILABLE_OPTIONS)
     set(_MAX_FEATURE_LENGTH 0)
     foreach (_name ${_WEBKIT_AVAILABLE_OPTIONS})
@@ -189 +183 @@
             endif ()
         endif ()
+
+        option(${_name} "${_WEBKIT_AVAILABLE_OPTIONS_DESCRIPTION_${_name}}" ${_WEBKIT_AVAILABLE_OPTIONS_INITIALVALUE_${_name}})
+        if (NOT _WEBKIT_AVAILABLE_OPTIONS_ISPUBLIC_${_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}")
+        endif ()
     endforeach ()
-
+endmacro()
+
+macro(PRINT_WEBKIT_OPTIONS)
     message(STATUS "Enabled features:")
 
@@ -211 +217 @@
         endif ()
 
-        if (${_name})
-            list(APPEND FEATURE_DEFINES ${_name})
-            set(FEATURE_DEFINES_WITH_SPACE_SEPARATOR "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR} ${_name}")
-        endif ()
-
         set(_MESSAGE "${_MESSAGE} ${${_name}}")