Changeset 264641 in webkit

Timestamp:

Jul 20, 2020, 5:33:59 PM (6 years ago)

Author:

Adrian Perez de Castro

Message:

[CMake] Do not use ${DEVELOPER_MODE} directly, as it may be undefined

Unreviewed build fix.

Instead of using ${DEVELOPER_MODE} directly, which might be undefined an cause errors, set
first ENABLE_DEVELOPER_MODE based on its value with SET_AND_EXPOSE_TO_BUILD(), and then use
the ${ENABLE_DEVELOPER_MODE} expansion in the rest of the file.

• Source/cmake/OptionsWPE.cmake:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsWPE.cmake (modified) (4 diffs)

trunk/ChangeLog

@@ +1 @@
+2020-07-20  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [CMake] Do not use ${DEVELOPER_MODE} directly, as it may be undefined
+
+        Unreviewed build fix.
+
+        Instead of using ${DEVELOPER_MODE} directly, which might be undefined an cause errors, set
+        first ENABLE_DEVELOPER_MODE based on its value with SET_AND_EXPOSE_TO_BUILD(), and then use
+        the ${ENABLE_DEVELOPER_MODE} expansion in the rest of the file.
+
+        * Source/cmake/OptionsWPE.cmake:
+
 2020-07-13  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 

trunk/Source/cmake/OptionsWPE.cmake

@@ -37 +37 @@
 
 WEBKIT_OPTION_BEGIN()
+
+SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
 
 include(GStreamerDefinitions)
@@ -84 +86 @@
 WEBKIT_OPTION_DEFINE(USE_OPENJPEG "Whether to enable support for JPEG2000 images." PUBLIC ON)
 WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON)
-WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC ${DEVELOPER_MODE})
+WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC ${ENABLE_DEVELOPER_MODE})
 WEBKIT_OPTION_DEFINE(USE_SYSTEMD "Whether to enable journald logging" PUBLIC ON)
 
@@ -99 +101 @@
 endif ()
 
-SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
-if (DEVELOPER_MODE)
+if (ENABLE_DEVELOPER_MODE)
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC ON)
@@ -228 +229 @@
 
 if (WTF_CPU_ARM OR WTF_CPU_MIPS)
-    SET_AND_EXPOSE_TO_BUILD(USE_CAPSTONE ${DEVELOPER_MODE})
+    SET_AND_EXPOSE_TO_BUILD(USE_CAPSTONE ${ENABLE_DEVELOPER_MODE})
 endif ()