diff options
author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebKit/efl/CMakeListsEfl.txt | |
parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebKit/efl/CMakeListsEfl.txt')
-rw-r--r-- | WebKit/efl/CMakeListsEfl.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/WebKit/efl/CMakeListsEfl.txt b/WebKit/efl/CMakeListsEfl.txt index c154b66..1964d15 100644 --- a/WebKit/efl/CMakeListsEfl.txt +++ b/WebKit/efl/CMakeListsEfl.txt @@ -92,10 +92,15 @@ SET(BUILD_DATA_DIR ${CMAKE_BINARY_DIR}/WebKit/efl/DefaultTheme) SET(BUILD_DATA_DIR ${BUILD_DATA_DIR} PARENT_SCOPE) FILE(MAKE_DIRECTORY ${BUILD_DATA_DIR}) +SET(WebKit_THEME_DEFINITION "") +IF (ENABLE_PROGRESS_TAG) + LIST(APPEND WebKit_THEME_DEFINITION "-DENABLE_PROGRESS_TAG") +ENDIF () + SET(WebKit_THEME ${BUILD_DATA_DIR}/default.edj) ADD_CUSTOM_COMMAND( OUTPUT ${WebKit_THEME} - COMMAND ${EDJE_CC_EXECUTABLE} -v -id ${WEBKIT_DIR}/efl/DefaultTheme ${WEBKIT_DIR}/efl/DefaultTheme/default.edc ${WebKit_THEME} + COMMAND ${EDJE_CC_EXECUTABLE} -v -id ${WEBKIT_DIR}/efl/DefaultTheme ${WebKit_THEME_DEFINITION} ${WEBKIT_DIR}/efl/DefaultTheme/default.edc ${WebKit_THEME} DEPENDS ${WEBKIT_DIR}/efl/DefaultTheme/default.edc ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider_knob_v.png @@ -159,6 +164,9 @@ ADD_CUSTOM_COMMAND( ${WEBKIT_DIR}/efl/DefaultTheme/widget/file/file_hover.png ${WEBKIT_DIR}/efl/DefaultTheme/widget/file/file_focus.png ${WEBKIT_DIR}/efl/DefaultTheme/widget/file/file.edc + ${WEBKIT_DIR}/efl/DefaultTheme/widget/progressbar/progressbar.edc + ${WEBKIT_DIR}/efl/DefaultTheme/widget/progressbar/shelf_inset.png + ${WEBKIT_DIR}/efl/DefaultTheme/widget/progressbar/bt_base.png VERBATIM ) |