Changeset 166501 in webkit

Timestamp:

Mar 31, 2014 7:44:32 AM (10 years ago)

Author:

rakuco@webkit.org

Message:

[CMake][GTK] Do not expand variables twice in if() checks.
​https://bugs.webkit.org/show_bug.cgi?id=130964

Reviewed by Martin Robinson.

In CMake, `if (${foo})' causes $foo to be evaluated first and its value
to be checked by the if clause. This is not what we want, and
configuration fails when, say, GLX support wasn't found as the if
clause is actually evaluated as `if (TRUE AND (OR TRUE))'.

• Source/cmake/OptionsGTK.cmake: Pass if (FOO) instead of if (${FOO})

where necessary.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2014-03-31  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
+
+        [CMake][GTK] Do not expand variables twice in if() checks.
+        https://bugs.webkit.org/show_bug.cgi?id=130964
+
+        Reviewed by Martin Robinson.
+
+        In CMake, `if (${foo})' causes $foo to be evaluated first and its value
+        to be checked by the if clause. This is not what we want, and
+        configuration fails when, say, GLX support wasn't found as the if
+        clause is actually evaluated as `if (TRUE AND (OR TRUE))'.
+
+        * Source/cmake/OptionsGTK.cmake: Pass if (FOO) instead of if (${FOO})
+        where necessary.
+
 2014-03-31  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/cmake/OptionsGTK.cmake

@@ -236 +236 @@
 endif ()
 
-if (${OPENGL_FOUND} AND (${GLX_FOUND} OR ${EGL_FOUND}))
+if (OPENGL_FOUND AND (GLX_FOUND OR EGL_FOUND))
     set(ENABLE_WEBGL 1)
     set(ENABLE_TEXTURE_MAPPER 1)
@@ -248 +248 @@
     add_definitions(-DENABLE_3D_RENDERING=1)
 
-    if (${EGL_FOUND})
+    if (EGL_FOUND)
         add_definitions(-DWTF_USE_EGL=1)
     endif ()
 
-    if (${GLX_FOUND})
+    if (GLX_FOUND)
         add_definitions(-DWTF_USE_GLX=1)
     endif ()