Title: [239004] releases/WebKitGTK/webkit-2.22
- Revision
- 239004
- Author
- [email protected]
- Date
- 2018-12-07 17:19:58 -0800 (Fri, 07 Dec 2018)
Log Message
Merge r235253 - [CMake] Have checks are not getting set inside CMake properly
https://bugs.webkit.org/show_bug.cgi?id=188901
Reviewed by Michael Catanzaro.
.:
Make sure the variable's value is sent to SET_AND_EXPOSE_TO_BUILD
within the WEBKIT_CHECK_HAVE_* macros.
* Source/cmake/WebKitFeatures.cmake:
PerformanceTests:
Add notification that MallocBench is disabled.
* CMakeLists.txt:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.22/ChangeLog (239003 => 239004)
--- releases/WebKitGTK/webkit-2.22/ChangeLog 2018-12-08 01:19:56 UTC (rev 239003)
+++ releases/WebKitGTK/webkit-2.22/ChangeLog 2018-12-08 01:19:58 UTC (rev 239004)
@@ -1,3 +1,15 @@
+2018-08-23 Don Olmstead <[email protected]>
+
+ [CMake] Have checks are not getting set inside CMake properly
+ https://bugs.webkit.org/show_bug.cgi?id=188901
+
+ Reviewed by Michael Catanzaro.
+
+ Make sure the variable's value is sent to SET_AND_EXPOSE_TO_BUILD
+ within the WEBKIT_CHECK_HAVE_* macros.
+
+ * Source/cmake/WebKitFeatures.cmake:
+
2018-10-27 Charlie Turner <[email protected]>
Make VIDEO enabled if ENCRYPTED_MEDIA is enabled.
Modified: releases/WebKitGTK/webkit-2.22/PerformanceTests/CMakeLists.txt (239003 => 239004)
--- releases/WebKitGTK/webkit-2.22/PerformanceTests/CMakeLists.txt 2018-12-08 01:19:56 UTC (rev 239003)
+++ releases/WebKitGTK/webkit-2.22/PerformanceTests/CMakeLists.txt 2018-12-08 01:19:58 UTC (rev 239004)
@@ -1,5 +1,7 @@
if (NOT USE_SYSTEM_MALLOC)
add_subdirectory(MallocBench)
+else ()
+ message(WARNING "MallocBench is not available on this platform")
endif ()
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
Modified: releases/WebKitGTK/webkit-2.22/PerformanceTests/ChangeLog (239003 => 239004)
--- releases/WebKitGTK/webkit-2.22/PerformanceTests/ChangeLog 2018-12-08 01:19:56 UTC (rev 239003)
+++ releases/WebKitGTK/webkit-2.22/PerformanceTests/ChangeLog 2018-12-08 01:19:58 UTC (rev 239004)
@@ -1,3 +1,14 @@
+2018-08-23 Don Olmstead <[email protected]>
+
+ [CMake] Have checks are not getting set inside CMake properly
+ https://bugs.webkit.org/show_bug.cgi?id=188901
+
+ Reviewed by Michael Catanzaro.
+
+ Add notification that MallocBench is disabled.
+
+ * CMakeLists.txt:
+
2018-08-13 Jon Lee <[email protected]>
Update MotionMark version number
Modified: releases/WebKitGTK/webkit-2.22/Source/cmake/WebKitFeatures.cmake (239003 => 239004)
--- releases/WebKitGTK/webkit-2.22/Source/cmake/WebKitFeatures.cmake 2018-12-08 01:19:56 UTC (rev 239003)
+++ releases/WebKitGTK/webkit-2.22/Source/cmake/WebKitFeatures.cmake 2018-12-08 01:19:58 UTC (rev 239004)
@@ -363,22 +363,22 @@
macro(WEBKIT_CHECK_HAVE_INCLUDE _variable _header)
check_include_file(${_header} ${_variable}_value)
- SET_AND_EXPOSE_TO_BUILD(${_variable} ${_variable}_value)
+ SET_AND_EXPOSE_TO_BUILD(${_variable} ${${_variable}_value})
endmacro()
macro(WEBKIT_CHECK_HAVE_FUNCTION _variable _function)
check_function_exists(${_function} ${_variable}_value)
- SET_AND_EXPOSE_TO_BUILD(${_variable} ${_variable}_value)
+ SET_AND_EXPOSE_TO_BUILD(${_variable} ${${_variable}_value})
endmacro()
macro(WEBKIT_CHECK_HAVE_SYMBOL _variable _symbol _header)
check_symbol_exists(${_symbol} ${_header} ${_variable}_value)
- SET_AND_EXPOSE_TO_BUILD(${_variable} ${_variable}_value)
+ SET_AND_EXPOSE_TO_BUILD(${_variable} ${${_variable}_value})
endmacro()
macro(WEBKIT_CHECK_HAVE_STRUCT _variable _struct _member _header)
check_struct_has_member(${_struct} ${_member} ${_header} ${_variable}_value)
- SET_AND_EXPOSE_TO_BUILD(${_variable} ${_variable}_value)
+ SET_AND_EXPOSE_TO_BUILD(${_variable} ${${_variable}_value})
endmacro()
option(ENABLE_EXPERIMENTAL_FEATURES "Enable experimental features" OFF)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
