Skip to content
Permalink
Browse files
2010-07-20 Rafael Antognolli <antognolli@profusion.mobi>
        Reviewed by Antonio Gomes.

        [EFL] Enable Ecore-X on compile time
        https://bugs.webkit.org/show_bug.cgi?id=42600

        Check for a flag received from cmake configure and disable it
        if necessary. Also disable it if Ecore-X wasn't found.

        EFL port does not support automated tests yet.

        * cmake/FindEFL.cmake:
        * cmake/OptionsEfl.cmake:

Canonical link: https://commits.webkit.org/54606@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63768 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
webkit-commit-queue committed Jul 20, 2010
1 parent a7d86f9 commit 413915299c4a68ffaf8dc842c65b8fbc197b4e1d
Showing with 26 additions and 3 deletions.
  1. +15 −0 ChangeLog
  2. +1 −1 cmake/FindEFL.cmake
  3. +10 −2 cmake/OptionsEfl.cmake
@@ -1,3 +1,18 @@
2010-07-20 Rafael Antognolli <antognolli@profusion.mobi>

Reviewed by Antonio Gomes.

[EFL] Enable Ecore-X on compile time
https://bugs.webkit.org/show_bug.cgi?id=42600

Check for a flag received from cmake configure and disable it
if necessary. Also disable it if Ecore-X wasn't found.

EFL port does not support automated tests yet.

* cmake/FindEFL.cmake:
* cmake/OptionsEfl.cmake:

2010-07-20 Hans Wennborg <hans@chromium.org>

Reviewed by Steve Block.
@@ -11,6 +11,6 @@ PKG_CHECK_MODULES (EFLDEPS REQUIRED
ecore-evas>=0.9.9.063
edje>=0.9.9.063)
PKG_CHECK_MODULES (EINA REQUIRED eina-0>=0.9.9.063)
PKG_CHECK_MODULES (ECORE_X REQUIRED ecore-x>=0.9.9.063)
PKG_CHECK_MODULES (ECORE_X ecore-x>=0.9.9.063)
PKG_CHECK_MODULES (EVAS REQUIRED evas>=0.9.9.063)

@@ -43,8 +43,6 @@ ENDIF ()
SET(WTF_USE_FREETYPE 1)
ADD_DEFINITIONS(-DUSE_FREETYPE=1)

ADD_DEFINITIONS(-DHAVE_ECORE_X)

SET(JSC_EXECUTABLE_NAME jsc)
SET(WTF_LIBRARY_NAME wtf)
SET(JavaScriptCore_LIBRARY_NAME javascriptcore)
@@ -88,4 +86,14 @@ WEBKIT_FEATURE(ENABLE_XHTMLMP "Enable XHTMLMP" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_XPATH "Enable XPath" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_XSLT "Enable XSLT" DEFAULT ON)

OPTION(ENABLE_ECORE_X "Enable Ecore_X specific usage (cursor, bell)" ON)
IF (${ENABLE_ECORE_X})
IF (ECORE_X_FOUND)
MESSAGE(STATUS "Using Ecore-X to provide extended support.")
ADD_DEFINITIONS(-DHAVE_ECORE_X)
ELSE ()
MESSAGE(ERROR "Requested Ecore-X but it was not found!")
ENDIF ()
ENDIF ()

SET(CPACK_SOURCE_GENERATOR TBZ2)

0 comments on commit 4139152

Please sign in to comment.