[CMake] Drop the required version of CMake down to 2.8.8
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Aug 2014 08:17:01 +0000 (08:17 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Aug 2014 08:17:01 +0000 (08:17 +0000)
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.

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

CMakeLists.txt
ChangeLog
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog

index 6388b1f..02cfaf9 100644 (file)
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 2.8.8)
 project(WebKit)
 
 # -----------------------------------------------------------------------------
index 93c6a70..a14446d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-08-08  Zan Dobersek  <zdobersek@igalia.com>
+
+        [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  <bpoulain@apple.com>
 
         Get rid of INPUT_SPEECH
index 30f6dc0..2dc0650 100644 (file)
@@ -3602,7 +3602,12 @@ endif ()
 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 ()
index 430123d..ec8eaaf 100644 (file)
@@ -1,3 +1,14 @@
+2014-08-08  Zan Dobersek  <zdobersek@igalia.com>
+
+        [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  <pnormand@igalia.com>
 
         [GStreamer][1.4] Caps negotiation failure in playback pipeline