2010-07-20 Rafael Antognolli <antognolli@profusion.mobi>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 20 Jul 2010 19:55:56 +0000 (19:55 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 20 Jul 2010 19:55:56 +0000 (19:55 +0000)
        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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63768 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
cmake/FindEFL.cmake
cmake/OptionsEfl.cmake

index efa6a7c7a3031eb5bbd47c1aec72d4845b7f71d9..f1aec58a59606b777d99c65e11b283f8607c9198 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
index c2efdcbc59feebb09457fbd053c0f08ea7ecb704..cfff96ffa69318fc4ac5c56d04050bf0e6aaf5a7 100644 (file)
@@ -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)
 
index 78b91283aa27c8633995a7544541900ce25d7607..3be7bda67715509bd630491fe16fa7189e8aa72b 100644 (file)
@@ -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)