Changeset 184063 in webkit

Timestamp:

May 10, 2015, 8:07:09 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

CMake defines CAIROGL_FOUND, not CAIRO_GL_FOUND
​https://bugs.webkit.org/show_bug.cgi?id=144846

Patch by Philip Chimento <​philip.chimento@gmail.com> on 2015-05-10
Reviewed by Martin Robinson.

• Source/cmake/FindCairoGL.cmake: Use CAIROGL_* instead of

CAIRO_GL_* throughout, because find_package will define
CAIROGL_FOUND.

• Source/cmake/OptionsGTK.cmake: Ditto.

Location:

trunk

Files:

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

trunk/ChangeLog

@@ +1 @@
+2015-05-10  Philip Chimento  <philip.chimento@gmail.com>
+
+        CMake defines CAIROGL_FOUND, not CAIRO_GL_FOUND
+        https://bugs.webkit.org/show_bug.cgi?id=144846
+
+        Reviewed by Martin Robinson.
+
+        * Source/cmake/FindCairoGL.cmake: Use CAIROGL_* instead of
+        CAIRO_GL_* throughout, because find_package will define
+        CAIROGL_FOUND.
+        * Source/cmake/OptionsGTK.cmake: Ditto.
+
 2015-05-10  Philip Chimento  <philip.chimento@gmail.com>
 

trunk/Source/cmake/FindCairoGL.cmake

@@ -2 +2 @@
 # Once done, this will define
 #
-#  CAIRO_GL_FOUND - system has CairoGL
-#  CAIRO_GL_INCLUDE_DIRS - the CairoGL include directories
-#  CAIRO_GL_LIBRARIES - link these to use CairoGL
+#  CAIROGL_FOUND - system has CairoGL
+#  CAIROGL_INCLUDE_DIRS - the CairoGL include directories
+#  CAIROGL_LIBRARIES - link these to use CairoGL
 #
 # Copyright (C) 2014 Igalia S.L.
@@ -30 +30 @@
 
 find_package(PkgConfig)
-pkg_check_modules(CAIRO_GL cairo-gl)
+pkg_check_modules(CAIROGL cairo-gl)
 
 # At the moment CairoGL does not add any extra cflags and libraries, so we can
-# safely ignore CAIRO_GL_LIBRARIES and CAIRO_GL_INCLUDE_DIRS for the moment.
+# safely ignore CAIROGL_LIBRARIES and CAIROGL_INCLUDE_DIRS for the moment.
 foreach (_component ${CairoGL_FIND_COMPONENTS})
     string(TOUPPER ${_component} _UPPER_NAME)
     string(REGEX REPLACE "-" "_" _UPPER_NAME ${_UPPER_NAME})
     pkg_check_modules(${_UPPER_NAME} ${_component})
-    set(CAIRO_GL_INCLUDE_DIRS ${CAIRO_GL_INCLUDE_DIRS} ${_UPPER_NAME}_INCLUDE_DIRS)
-    set(CAIRO_GL_LIBRARIES ${CAIRO_GL_LIBRARIES} ${_UPPER_NAME}_LIBRARIES)
+    set(CAIROGL_INCLUDE_DIRS ${CAIROGL_INCLUDE_DIRS} ${_UPPER_NAME}_INCLUDE_DIRS)
+    set(CAIROGL_LIBRARIES ${CAIROGL_LIBRARIES} ${_UPPER_NAME}_LIBRARIES)
 endforeach ()
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CairoGL DEFAULT_MSG CAIRO_GL_INCLUDE_DIRS CAIRO_GL_LIBRARIES)
+find_package_handle_standard_args(CairoGL DEFAULT_MSG CAIROGL_INCLUDE_DIRS CAIROGL_LIBRARIES)
 

trunk/Source/cmake/OptionsGTK.cmake

@@ -103 +103 @@
 
     if (GLX_FOUND)
-        list(APPEND CAIRO_GL_COMPONENTS cairo-glx)
+        list(APPEND CAIROGL_COMPONENTS cairo-glx)
     endif ()
     if (EGL_FOUND)
-        list(APPEND CAIRO_GL_COMPONENTS cairo-egl)
-    endif ()
-    find_package(CairoGL 1.10.2 COMPONENTS ${CAIRO_GL_COMPONENTS})
+        list(APPEND CAIROGL_COMPONENTS cairo-egl)
+    endif ()
+    find_package(CairoGL 1.10.2 COMPONENTS ${CAIROGL_COMPONENTS})
 endif ()
 
@@ -120 +120 @@
 # can't check ENABLE_X11_TARGET at this point because we don't know whether it's enabled until
 # WEBKIT_OPTION_END has been called, and at that point it's too late to change default values.
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC ${CAIRO_GL_FOUND})
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC ${CAIROGL_FOUND})
 
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CREDENTIAL_STORAGE PUBLIC ON)