Title: [172340] trunk
- Revision
- 172340
- Author
- [email protected]
- Date
- 2014-08-08 01:17:01 -0700 (Fri, 08 Aug 2014)
Log Message
[CMake] Drop the required version of CMake down to 2.8.8
https://bugs.webkit.org/show_bug.cgi?id=135713
Reviewed by Alex Christensen.
.:
* CMakeLists.txt: Require CMake 2.8.8.
Source/WebCore:
* CMakeLists.txt: Use set_property() to set INCLUDE_DIRECTORIES for
the ANGLESupport library. This avoids using target_include_directories()
which requires CMake 2.8.11.
Modified Paths
Diff
Modified: trunk/CMakeLists.txt (172339 => 172340)
--- trunk/CMakeLists.txt 2014-08-08 08:09:08 UTC (rev 172339)
+++ trunk/CMakeLists.txt 2014-08-08 08:17:01 UTC (rev 172340)
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 2.8.8)
project(WebKit)
# -----------------------------------------------------------------------------
Modified: trunk/ChangeLog (172339 => 172340)
--- trunk/ChangeLog 2014-08-08 08:09:08 UTC (rev 172339)
+++ trunk/ChangeLog 2014-08-08 08:17:01 UTC (rev 172340)
@@ -1,3 +1,12 @@
+2014-08-08 Zan Dobersek <[email protected]>
+
+ [CMake] Drop the required version of CMake down to 2.8.8
+ https://bugs.webkit.org/show_bug.cgi?id=135713
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt: Require CMake 2.8.8.
+
2014-08-07 Benjamin Poulain <[email protected]>
Get rid of INPUT_SPEECH
Modified: trunk/Source/WebCore/CMakeLists.txt (172339 => 172340)
--- trunk/Source/WebCore/CMakeLists.txt 2014-08-08 08:09:08 UTC (rev 172339)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-08-08 08:17:01 UTC (rev 172340)
@@ -3602,7 +3602,12 @@
if (WTF_USE_3D_GRAPHICS)
add_library(ANGLESupport STATIC ${ANGLESupport_SOURCES})
set_target_properties(ANGLESupport PROPERTIES FOLDER "WebCore")
- target_include_directories(ANGLESupport PRIVATE "${THIRDPARTY_DIR}/ANGLE/include")
+ set_property(
+ TARGET ANGLESupport
+ APPEND
+ PROPERTY INCLUDE_DIRECTORIES
+ "${THIRDPARTY_DIR}/ANGLE/include"
+ )
list(APPEND WebCore_LIBRARIES ANGLESupport)
WEBKIT_SET_EXTRA_COMPILER_FLAGS(ANGLESupport IGNORECXX_WARNINGS)
endif ()
Modified: trunk/Source/WebCore/ChangeLog (172339 => 172340)
--- trunk/Source/WebCore/ChangeLog 2014-08-08 08:09:08 UTC (rev 172339)
+++ trunk/Source/WebCore/ChangeLog 2014-08-08 08:17:01 UTC (rev 172340)
@@ -1,3 +1,14 @@
+2014-08-08 Zan Dobersek <[email protected]>
+
+ [CMake] Drop the required version of CMake down to 2.8.8
+ https://bugs.webkit.org/show_bug.cgi?id=135713
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt: Use set_property() to set INCLUDE_DIRECTORIES for
+ the ANGLESupport library. This avoids using target_include_directories()
+ which requires CMake 2.8.11.
+
2014-08-05 Philippe Normand <[email protected]>
[GStreamer][1.4] Caps negotiation failure in playback pipeline
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
