Changeset 185725 in webkit

Timestamp:

Jun 18, 2015, 4:35:24 PM (11 years ago)

Author:

ryuan.choi@navercorp.com

Message:

[EFL] Use SET_AND_EXPOSE_TO_BUILD instead of definitions
​https://bugs.webkit.org/show_bug.cgi?id=146108

Reviewed by Gyuyoung Kim.

• Source/cmake/OptionsEfl.cmake:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsEfl.cmake (modified) (6 diffs)

trunk/ChangeLog

@@ +1 @@
+2015-06-18  Ryuan Choi  <ryuan.choi@navercorp.com>
+
+        [EFL] Use SET_AND_EXPOSE_TO_BUILD instead of definitions
+        https://bugs.webkit.org/show_bug.cgi?id=146108
+
+        Reviewed by Gyuyoung Kim.
+
+        * Source/cmake/OptionsEfl.cmake:
+
 2015-06-16  Ryuan Choi  <ryuan.choi@navercorp.com>
 

trunk/Source/cmake/OptionsEfl.cmake

@@ -143 +143 @@
 
     list(APPEND ECORE_ADDITIONAL_COMPONENTS X)
-    add_definitions(-DHAVE_ECORE_X)
-    add_definitions(-DWTF_PLATFORM_X11=1)
-    add_definitions(-DMOZ_X11)
+    SET_AND_EXPOSE_TO_BUILD(HAVE_ECORE_X 1)
+    SET_AND_EXPOSE_TO_BUILD(WTF_PLATFORM_X11 1)
+    SET_AND_EXPOSE_TO_BUILD(MOZ_X11 1)
 endif ()
 
@@ -187 +187 @@
 if (ENABLE_MEDIA_STREAM)
     find_package(OpenWebRTC REQUIRED)
-    add_definitions(-DUSE_OPENWEBRTC)
+    SET_AND_EXPOSE_TO_BUILD(USE_OPENWEBRTC TRUE)
 endif ()
 
@@ -196 +196 @@
 if (WTF_OS_UNIX)
     set(ENABLE_X11_TARGET ON)
-    add_definitions(-DXP_UNIX)
+    SET_AND_EXPOSE_TO_BUILD(XP_UNIX 1)
 endif (WTF_OS_UNIX)
 
 if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
     set(GSTREAMER_COMPONENTS app mpegts pbutils)
-    set(USE_GSTREAMER 1)
-    add_definitions(-DUSE_GSTREAMER=1)
+    SET_AND_EXPOSE_TO_BUILD(USE_GSTREAMER TRUE)
 
     if (ENABLE_VIDEO)
@@ -221 +220 @@
 endif ()
 
-add_definitions(-DUSE_COORDINATED_GRAPHICS=1)
-add_definitions(-DUSE_COORDINATED_GRAPHICS_MULTIPROCESS=1)
-add_definitions(-DUSE_TEXTURE_MAPPER=1)
-
-set(ENABLE_GRAPHICS_CONTEXT_3D 1)
-add_definitions(-DENABLE_GRAPHICS_CONTEXT_3D=1)
-add_definitions(-DUSE_GRAPHICS_SURFACE=1)
+SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_3D TRUE)
+SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS TRUE)
+SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_MULTIPROCESS TRUE)
+SET_AND_EXPOSE_TO_BUILD(USE_GRAPHICS_SURFACE TRUE)
+SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER TRUE)
 
 option(ENABLE_GLES2 "Enable GLES Support")
 if (ENABLE_GLES2)
     find_package(OpenGLES2 REQUIRED)
-    set(USE_OPENGL_ES_2 1)
-    add_definitions(-DUSE_OPENGL_ES_2=1)
+    SET_AND_EXPOSE_TO_BUILD(USE_OPENGL_ES_2 TRUE)
 else ()
     find_package(OpenGL REQUIRED)
-    set(USE_OPENGL 1)
-    add_definitions(-DUSE_OPENGL=1)
+    SET_AND_EXPOSE_TO_BUILD(USE_OPENGL TRUE)
 endif ()
 
@@ -243 +238 @@
 if (ENABLE_EGL)
     find_package(EGL REQUIRED)
-    set(USE_EGL 1)
-    add_definitions(-DUSE_EGL=1)
+    SET_AND_EXPOSE_TO_BUILD(USE_EGL TRUE)
 else ()
     CHECK_INCLUDE_FILES("GL/glx.h" OPENGLX_FOUND)
-    add_definitions(-DUSE_GLX=1)
+    SET_AND_EXPOSE_TO_BUILD(USE_GLX TRUE)
 endif ()
 
@@ -267 +261 @@
 if (ENABLE_SPEECH_SYNTHESIS)
     find_package(Espeak REQUIRED)
-    add_definitions(-DENABLE_SPEECH_SYNTHESIS=1)
 endif ()