Title: [264641] trunk
- Revision
- 264641
- Author
- [email protected]
- Date
- 2020-07-20 17:33:59 -0700 (Mon, 20 Jul 2020)
Log 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:
Modified Paths
Diff
Modified: trunk/ChangeLog (264640 => 264641)
--- trunk/ChangeLog 2020-07-21 00:11:13 UTC (rev 264640)
+++ trunk/ChangeLog 2020-07-21 00:33:59 UTC (rev 264641)
@@ -1,3 +1,15 @@
+2020-07-20 Adrian Perez de Castro <[email protected]>
+
+ [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 <[email protected]>
Unreviewed. Fixed copy&paste typos of gcrypt -> Thunder
Modified: trunk/Source/cmake/OptionsWPE.cmake (264640 => 264641)
--- trunk/Source/cmake/OptionsWPE.cmake 2020-07-21 00:11:13 UTC (rev 264640)
+++ trunk/Source/cmake/OptionsWPE.cmake 2020-07-21 00:33:59 UTC (rev 264641)
@@ -37,6 +37,8 @@
WEBKIT_OPTION_BEGIN()
+SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
+
include(GStreamerDefinitions)
# Public options shared with other WebKit ports. Do not add any options here
@@ -83,7 +85,7 @@
WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF)
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)
# Private options specific to the WPE port.
@@ -98,8 +100,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE OFF)
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)
endif ()
@@ -227,7 +228,7 @@
SET_AND_EXPOSE_TO_BUILD(USE_XDGMIME TRUE)
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 ()
SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_GL TRUE)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
