From 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 2 Jun 2011 12:07:03 +0100 Subject: Merge WebKit at r84325: Initial merge by git. Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b --- Source/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Source/CMakeLists.txt') diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index d6368c0..cdaa555 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -13,7 +13,8 @@ SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/JavaScriptCore") SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/WebCore") SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/WebKit") SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/../Tools") -SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources") +SET(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore") +SET(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore") INCLUDE(WebKitMacros) INCLUDE(WebKitFS) -- cgit v1.1