diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-25 13:35:59 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-25 13:35:59 +0200 |
| commit | 79ad030d505ccf79cf10aa9f8189ca3e2f61f6f4 (patch) | |
| tree | 0287b1a69d84492c901e8bc820e635e7133809a0 /Source/cmake | |
| parent | 682ab87480e7757346802ce7f54cfdbdfeb2339e (diff) | |
| download | qtwebkit-79ad030d505ccf79cf10aa9f8189ca3e2f61f6f4.tar.gz | |
Imported WebKit commit c4b613825abd39ac739a47d7b4410468fcef66dc (http://svn.webkit.org/repository/webkit/trunk@121147)
New snapshot that includes Win32 debug build fix (use SVGAllInOne)
Diffstat (limited to 'Source/cmake')
| -rw-r--r-- | Source/cmake/OptionsBlackBerry.cmake | 3 | ||||
| -rw-r--r-- | Source/cmake/OptionsCommon.cmake | 1 | ||||
| -rw-r--r-- | Source/cmake/OptionsEfl.cmake | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmake/OptionsBlackBerry.cmake b/Source/cmake/OptionsBlackBerry.cmake index 11e02982e..a04ac31b2 100644 --- a/Source/cmake/OptionsBlackBerry.cmake +++ b/Source/cmake/OptionsBlackBerry.cmake @@ -32,6 +32,9 @@ IF (ADDITIONAL_SYSTEM_INCLUDE_PATH) FOREACH (directory ${ADDITIONAL_SYSTEM_INCLUDE_PATH}) INCLUDE_DIRECTORIES(SYSTEM ${directory}) ENDFOREACH () + IF(ENABLE_WEBGL) + INCLUDE_DIRECTORIES(SYSTEM ${THIRDPARTY_DIR}/ANGLE/include) #As system so as to be lower-priority than actual system headers + ENDIF () ENDIF () IF (ENABLE_DRT) diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake index bae6527f4..044651e55 100644 --- a/Source/cmake/OptionsCommon.cmake +++ b/Source/cmake/OptionsCommon.cmake @@ -29,3 +29,4 @@ SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON) SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") SET(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Where to install libraries (lib${LIB_SUFFIX})") +SET(EXEC_INSTALL_DIR "bin" CACHE PATH "Where to install executables") diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake index 355fe9aa7..3b26e52af 100644 --- a/Source/cmake/OptionsEfl.cmake +++ b/Source/cmake/OptionsEfl.cmake @@ -11,6 +11,7 @@ SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_ SET(WEBKIT_USER_AGENT_MAJOR_VERSION 534) SET(WEBKIT_USER_AGENT_MINOR_VERSION 16) +ADD_DEFINITIONS(-DBUILDING_EFL__=1) ADD_DEFINITIONS(-DWTF_PLATFORM_EFL=1) SET(WTF_PLATFORM_EFL 1) |