[GTK] Accelerated 2D Canvas enabled when cairo-gl is not available

https://bugs.webkit.org/show_bug.cgi?id=147625

Reviewed by Martin Robinson.

Do not set the CAIRO_<COMPONENT>_* CMake variables for cairo-gl
components unless they were actually found, not to accidentally
enable Accelerated 2D canvas, which would cause the build to fail.

* Source/cmake/FindCairoGL.cmake: Set this variables only when
pkg_check_modules() had actually found the relevant component.

Canonical link: https://commits.webkit.org/165685@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@187854 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog

@@ -1,3 +1,17 @@
+2015-08-04  Mario Sanchez Prada  <mario@endlessm.com>
+
+        [GTK] Accelerated 2D Canvas enabled when cairo-gl is not available
+        https://bugs.webkit.org/show_bug.cgi?id=147625
+
+        Reviewed by Martin Robinson.
+
+        Do not set the CAIRO_<COMPONENT>_* CMake variables for cairo-gl
+        components unless they were actually found, not to accidentally
+        enable Accelerated 2D canvas, which would cause the build to fail.
+
+        * Source/cmake/FindCairoGL.cmake: Set this variables only when
+        pkg_check_modules() had actually found the relevant component.
+
 2015-08-03  Csaba Osztrogonác  <ossy@webkit.org>
 
         [CMake] Add an option to build AllInOne files

Source/cmake/FindCairoGL.cmake

@@ -37,8 +37,12 @@ foreach (_component ${CairoGL_FIND_COMPONENTS})
     string(TOUPPER ${_component} _UPPER_NAME)
     string(REGEX REPLACE "-" "_" _UPPER_NAME ${_UPPER_NAME})
     pkg_check_modules(${_UPPER_NAME} ${_component})
-    set(CAIROGL_INCLUDE_DIRS ${CAIROGL_INCLUDE_DIRS} ${_UPPER_NAME}_INCLUDE_DIRS)
-    set(CAIROGL_LIBRARIES ${CAIROGL_LIBRARIES} ${_UPPER_NAME}_LIBRARIES)
+    if (${_UPPER_NAME}_INCLUDE_DIRS)
+      set(CAIROGL_INCLUDE_DIRS ${CAIROGL_INCLUDE_DIRS} ${_UPPER_NAME}_INCLUDE_DIRS)
+    endif ()
+    if (${_UPPER_NAME}_LIBRARIES)
+      set(CAIROGL_LIBRARIES ${CAIROGL_LIBRARIES} ${_UPPER_NAME}_LIBRARIES)
+    endif ()
 endforeach ()
 
 include(FindPackageHandleStandardArgs)