diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/cmake | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/cmake')
| -rw-r--r-- | Source/cmake/OptionsCommon.cmake | 1 | ||||
| -rw-r--r-- | Source/cmake/OptionsEfl.cmake | 8 | ||||
| -rw-r--r-- | Source/cmake/WebKitFS.cmake | 1 |
3 files changed, 1 insertions, 9 deletions
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}" ) diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake index b34ec3b..da9fe6c 100644 --- a/Source/cmake/OptionsEfl.cmake +++ b/Source/cmake/OptionsEfl.cmake @@ -114,15 +114,9 @@ IF (NETWORK_BACKEND STREQUAL "soup") SET(ENABLE_GLIB_SUPPORT 1) MESSAGE("Forcing Glib support") ENDIF () - FIND_PACKAGE(LibSoup2 2.28.2 REQUIRED) + FIND_PACKAGE(LibSoup2 2.33.4 REQUIRED) SET(WTF_USE_SOUP 1) ADD_DEFINITIONS(-DWTF_USE_SOUP=1) - - IF (LIBSOUP24_VERSION VERSION_LESS 2.29.90) - ELSE (LIBSOUP24_VERSION VERSION_LESS 2.29.90) - SET(HAVE_LIBSOUP_2_29_90 1) - ADD_DEFINITIONS(-DHAVE_LIBSOUP_2_29_90=1) - ENDIF () ELSE () FIND_PACKAGE(CURL REQUIRED) SET(WTF_USE_CURL 1) diff --git a/Source/cmake/WebKitFS.cmake b/Source/cmake/WebKitFS.cmake index a2117cd..74e7fb8 100644 --- a/Source/cmake/WebKitFS.cmake +++ b/Source/cmake/WebKitFS.cmake @@ -1,6 +1,5 @@ SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources") FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}) -FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/pcre) FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime) FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Programs) |