[CMake] Have checks are not getting set inside CMake properly
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 23 Aug 2018 22:53:05 +0000 (22:53 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 23 Aug 2018 22:53:05 +0000 (22:53 +0000)
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:

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

ChangeLog
PerformanceTests/CMakeLists.txt
PerformanceTests/ChangeLog
Source/cmake/WebKitFeatures.cmake

index daf1c1a..5771b6d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2018-08-23  Don Olmstead  <don.olmstead@sony.com>
 
+        [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-08-23  Don Olmstead  <don.olmstead@sony.com>
+
         [CMake] Add HAVE_MALLOC_TRIM definition
         https://bugs.webkit.org/show_bug.cgi?id=188897
 
index 0657f47..4322d2a 100644 (file)
@@ -1,6 +1,8 @@
 # MallocBench requires malloc_trim for non-Apple platforms
 if (NOT USE_SYSTEM_MALLOC AND (APPLE OR HAVE_MALLOC_TRIM))
     add_subdirectory(MallocBench)
+else ()
+    message(WARNING "MallocBench is not available on this platform")
 endif ()
 
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
index 80391f8..9b4dd6f 100644 (file)
@@ -1,5 +1,16 @@
 2018-08-23  Don Olmstead  <don.olmstead@sony.com>
 
+        [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-23  Don Olmstead  <don.olmstead@sony.com>
+
         [CMake] Add HAVE_MALLOC_TRIM definition
         https://bugs.webkit.org/show_bug.cgi?id=188897
 
index e15b6fe..55fdbd3 100644 (file)
@@ -362,22 +362,22 @@ endmacro()
 
 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)