Title: [191104] releases/WebKitGTK/webkit-2.10
- Revision
- 191104
- Author
- carlo...@webkit.org
- Date
- 2015-10-15 01:48:01 -0700 (Thu, 15 Oct 2015)
Log Message
Merge r191042 - [GTK][EFL] Fix build with cmake 3.4
https://bugs.webkit.org/show_bug.cgi?id=150117
Explicitely include the CheckIncludeFiles module before using
the CHECK_INCLUDE_FILES command.
Patch by Tomas Popela <tpop...@redhat.com> on 2015-10-14
Reviewed by Žan Doberšek.
* Source/cmake/FindOpenGL.cmake:
* Source/cmake/FindWebP.cmake:
* Source/cmake/OptionsEfl.cmake:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/ChangeLog (191103 => 191104)
--- releases/WebKitGTK/webkit-2.10/ChangeLog 2015-10-15 08:18:58 UTC (rev 191103)
+++ releases/WebKitGTK/webkit-2.10/ChangeLog 2015-10-15 08:48:01 UTC (rev 191104)
@@ -1,3 +1,17 @@
+2015-10-14 Tomas Popela <tpop...@redhat.com>
+
+ [GTK][EFL] Fix build with cmake 3.4
+ https://bugs.webkit.org/show_bug.cgi?id=150117
+
+ Explicitely include the CheckIncludeFiles module before using
+ the CHECK_INCLUDE_FILES command.
+
+ Reviewed by Žan Doberšek.
+
+ * Source/cmake/FindOpenGL.cmake:
+ * Source/cmake/FindWebP.cmake:
+ * Source/cmake/OptionsEfl.cmake:
+
2015-10-14 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.10.1 release.
Modified: releases/WebKitGTK/webkit-2.10/Source/cmake/FindOpenGL.cmake (191103 => 191104)
--- releases/WebKitGTK/webkit-2.10/Source/cmake/FindOpenGL.cmake 2015-10-15 08:18:58 UTC (rev 191103)
+++ releases/WebKitGTK/webkit-2.10/Source/cmake/FindOpenGL.cmake 2015-10-15 08:48:01 UTC (rev 191104)
@@ -59,6 +59,7 @@
include(CMakePushCheckState)
CMAKE_PUSH_CHECK_STATE()
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIRS})
+ include(CheckIncludeFiles)
check_include_files("GL/glx.h" GLX_FOUND)
CMAKE_POP_CHECK_STATE()
endif ()
Modified: releases/WebKitGTK/webkit-2.10/Source/cmake/FindWebP.cmake (191103 => 191104)
--- releases/WebKitGTK/webkit-2.10/Source/cmake/FindWebP.cmake 2015-10-15 08:18:58 UTC (rev 191103)
+++ releases/WebKitGTK/webkit-2.10/Source/cmake/FindWebP.cmake 2015-10-15 08:48:01 UTC (rev 191104)
@@ -35,6 +35,7 @@
if (NOT(WEBP_FOUND))
# Older installations of libwebp do not install a pkgconfig file, so we fall
# back to a manual search for a libwebp header file.
+ include(CheckIncludeFiles)
check_include_files("webp/decode.h" WEBP_FOUND_HEADER)
if (WEBP_FOUND_HEADER)
set(WEBP_LIBRARIES "-lwebp")
Modified: releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsEfl.cmake (191103 => 191104)
--- releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsEfl.cmake 2015-10-15 08:18:58 UTC (rev 191103)
+++ releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsEfl.cmake 2015-10-15 08:48:01 UTC (rev 191104)
@@ -249,6 +249,7 @@
find_package(EGL REQUIRED)
SET_AND_EXPOSE_TO_BUILD(USE_EGL TRUE)
else ()
+ include(CheckIncludeFiles)
CHECK_INCLUDE_FILES("GL/glx.h" OPENGLX_FOUND)
SET_AND_EXPOSE_TO_BUILD(USE_GLX TRUE)
endif ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
