CairoGL should be checked unconditionally

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

Patch by Philip Chimento <philip.chimento@gmail.com> on 2015-06-28
Reviewed by Darin Adler.

* Source/cmake/OptionsGTK.cmake: Move check for CairoGL so that
it is run unconditionally; this is necessary because its result
is used later on, outside of any conditions.

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

diff --git a/ChangeLog b/ChangeLog
index f997fec..4a7e06d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2015-06-28  Philip Chimento  <philip.chimento@gmail.com>
+
+        CairoGL should be checked unconditionally
+        https://bugs.webkit.org/show_bug.cgi?id=146390
+
+        Reviewed by Darin Adler.
+
+        * Source/cmake/OptionsGTK.cmake: Move check for CairoGL so that
+        it is run unconditionally; this is necessary because its result
+        is used later on, outside of any conditions.
+
 2015-06-27  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK][SOUP] Implement WebCore::PublicSuffix for soup and enable PUBLIC_SUFFIX_LIST for GTK+

diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
index e23e153..40fbc05 100644 (file)
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -116,8 +116,8 @@ if (OPENGL_FOUND)
     if (EGL_FOUND)
         list(APPEND CAIROGL_COMPONENTS cairo-egl)
     endif ()
-    find_package(CairoGL 1.10.2 COMPONENTS ${CAIROGL_COMPONENTS})
 endif ()
+find_package(CairoGL 1.10.2 COMPONENTS ${CAIROGL_COMPONENTS})
 
 # Normally we do not set the value of options automatically. However, CairoGL is special. Currently
 # most major distros compile Cario with --enable-gl, but Debian and derivitives are a major