Changeset 63768 in webkit


Ignore:
Timestamp:
Jul 20, 2010 12:55:56 PM (14 years ago)
Author:
commit-queue@webkit.org
Message:

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:
Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r63735 r63768  
     12010-07-20  Rafael Antognolli  <antognolli@profusion.mobi>
     2
     3        Reviewed by Antonio Gomes.
     4
     5        [EFL] Enable Ecore-X on compile time
     6        https://bugs.webkit.org/show_bug.cgi?id=42600
     7
     8        Check for a flag received from cmake configure and disable it
     9        if necessary. Also disable it if Ecore-X wasn't found.
     10
     11        EFL port does not support automated tests yet.
     12
     13        * cmake/FindEFL.cmake:
     14        * cmake/OptionsEfl.cmake:
     15
    1162010-07-20  Hans Wennborg  <hans@chromium.org>
    217
  • trunk/cmake/FindEFL.cmake

    r62015 r63768  
    1212  edje>=0.9.9.063)
    1313PKG_CHECK_MODULES (EINA REQUIRED eina-0>=0.9.9.063)
    14 PKG_CHECK_MODULES (ECORE_X REQUIRED ecore-x>=0.9.9.063)
     14PKG_CHECK_MODULES (ECORE_X ecore-x>=0.9.9.063)
    1515PKG_CHECK_MODULES (EVAS REQUIRED evas>=0.9.9.063)
    1616
  • trunk/cmake/OptionsEfl.cmake

    r63546 r63768  
    4444ADD_DEFINITIONS(-DUSE_FREETYPE=1)
    4545
    46 ADD_DEFINITIONS(-DHAVE_ECORE_X)
    47 
    4846SET(JSC_EXECUTABLE_NAME jsc)
    4947SET(WTF_LIBRARY_NAME wtf)
     
    8987WEBKIT_FEATURE(ENABLE_XSLT "Enable XSLT" DEFAULT ON)
    9088
     89OPTION(ENABLE_ECORE_X "Enable Ecore_X specific usage (cursor, bell)" ON)
     90IF (${ENABLE_ECORE_X})
     91    IF (ECORE_X_FOUND)
     92        MESSAGE(STATUS "Using Ecore-X to provide extended support.")
     93        ADD_DEFINITIONS(-DHAVE_ECORE_X)
     94    ELSE ()
     95        MESSAGE(ERROR "Requested Ecore-X but it was not found!")
     96    ENDIF ()
     97ENDIF ()
     98
    9199SET(CPACK_SOURCE_GENERATOR TBZ2)
Note: See TracChangeset for help on using the changeset viewer.