[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[dbates at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit c5f7d59ccec47eb9ecf6188ea7f0520fa8911623
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 29 23:14:22 2011 +0000

    2011-01-29  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Maciej Stachowiak.
    
            Remove reference to ${CMAKE_SOURCE_DIR}/Source in CMake files
            https://bugs.webkit.org/show_bug.cgi?id=53382
    
            Our file system hierarchy ensures that CMAKE_SOURCE_DIR is defined to be /Source.
            So, ${CMAKE_SOURCE_DIR}/Source evaluates to the non-existent directory /Source/Source.
            Therefore, we should remove such references.
    
            * Source/cmake/OptionsCommon.cmake:
    2011-01-29  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Maciej Stachowiak.
    
            Remove reference to ${CMAKE_SOURCE_DIR}/Source in CMake files
            https://bugs.webkit.org/show_bug.cgi?id=53382
    
            Our file system hierarchy ensures that CMAKE_SOURCE_DIR is defined to be /Source.
            So, ${CMAKE_SOURCE_DIR}/Source evaluates to the non-existent directory /Source/Source.
            Therefore, we should remove such references.
    
            * CMakeLists.txt:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77073 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index b0b6fd0..ff40fe6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2011-01-29  Daniel Bates  <dbates at rim.com>
 
+        Reviewed by Maciej Stachowiak.
+
+        Remove reference to ${CMAKE_SOURCE_DIR}/Source in CMake files
+        https://bugs.webkit.org/show_bug.cgi?id=53382
+
+        Our file system hierarchy ensures that CMAKE_SOURCE_DIR is defined to be /Source.
+        So, ${CMAKE_SOURCE_DIR}/Source evaluates to the non-existent directory /Source/Source.
+        Therefore, we should remove such references.
+
+        * Source/cmake/OptionsCommon.cmake:
+
+2011-01-29  Daniel Bates  <dbates at rim.com>
+
         Reviewed by Eric Seidel.
 
         Move wince/mt19937ar.c to ThirdParty and make it a policy choice
diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index c4b1158..bf3afb2 100644
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -80,7 +80,6 @@ SET(WebCore_INCLUDE_DIRECTORIES
     "${JAVASCRIPTCORE_DIR}/wtf/unicode"
     "${DERIVED_SOURCES_DIR}"
     "${CMAKE_SOURCE_DIR}"
-    "${CMAKE_SOURCE_DIR}/Source"
     "${CMAKE_BINARY_DIR}"
 )
 
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index d0a6da7..24c4bcc 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-29  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        Remove reference to ${CMAKE_SOURCE_DIR}/Source in CMake files
+        https://bugs.webkit.org/show_bug.cgi?id=53382
+
+        Our file system hierarchy ensures that CMAKE_SOURCE_DIR is defined to be /Source.
+        So, ${CMAKE_SOURCE_DIR}/Source evaluates to the non-existent directory /Source/Source.
+        Therefore, we should remove such references.
+
+        * CMakeLists.txt:
+
 2011-01-29  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Jon Honeycutt.
diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
index 0331df8..be465fa 100644
--- a/Source/cmake/OptionsCommon.cmake
+++ b/Source/cmake/OptionsCommon.cmake
@@ -5,7 +5,6 @@ SET(WTF_INCLUDE_DIRECTORIES
     "${JAVASCRIPTCORE_DIR}"
     "${JAVASCRIPTCORE_DIR}/wtf"
     "${JAVASCRIPTCORE_DIR}/wtf/unicode"
-    "${CMAKE_SOURCE_DIR}/Source"
     "${DERIVED_SOURCES_DIR}"
 )
 

-- 
WebKit Debian packaging