[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
paroga at webkit.org
paroga at webkit.org
Fri Jan 21 14:51:02 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 3527006433a37c4c7985f3ef1b6a529b551e698c
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Jan 2 19:16:26 2011 +0000
2011-01-02 Patrick Gansterer <paroga at webkit.org>
[CMake] Unreviewed build fix.
* CMakeLists.txt:
* Source/cmake/OptionsCommon.cmake:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74870 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a66917..3124beb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,7 +104,7 @@ INCLUDE(WebKitPackaging)
# -----------------------------------------------------------------------------
# Add module directories
# -----------------------------------------------------------------------------
-ADD_SUBDIRECTORY(JavaScriptCore)
+ADD_SUBDIRECTORY(Source/JavaScriptCore)
ADD_SUBDIRECTORY(WebCore)
ADD_SUBDIRECTORY(WebKit)
diff --git a/ChangeLog b/ChangeLog
index 22a29d6..d83b6df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-02 Patrick Gansterer <paroga at webkit.org>
+
+ [CMake] Unreviewed build fix.
+
+ * CMakeLists.txt:
+ * Source/cmake/OptionsCommon.cmake:
+
2011-01-01 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
index be465fa..0331df8 100644
--- a/Source/cmake/OptionsCommon.cmake
+++ b/Source/cmake/OptionsCommon.cmake
@@ -5,6 +5,7 @@ SET(WTF_INCLUDE_DIRECTORIES
"${JAVASCRIPTCORE_DIR}"
"${JAVASCRIPTCORE_DIR}/wtf"
"${JAVASCRIPTCORE_DIR}/wtf/unicode"
+ "${CMAKE_SOURCE_DIR}/Source"
"${DERIVED_SOURCES_DIR}"
)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list