Changeset 104722 in webkit

Timestamp:

Jan 11, 2012 10:32:00 AM (12 years ago)

Author:

efidler@rim.com

Message:

Fix OpenGL dependency in CMake build system
​https://bugs.webkit.org/show_bug.cgi?id=73559

Reviewed by Daniel Bates.

.:

Apparently the EFL port uses desktop OpenGL to implement WebGL, but
other ports such as BlackBerry use other libraries like OpenGL ES 2.0 or
ANGLE.

• Source/cmake/OptionsCommon.cmake:
• Source/cmake/OptionsEfl.cmake:

Source/WebCore:

• CMakeLists.txt:
• PlatformEfl.cmake:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebCore/CMakeLists.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/PlatformEfl.cmake (modified) (1 diff)
• Source/cmake/OptionsCommon.cmake (modified) (1 diff)
• Source/cmake/OptionsEfl.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2012-01-11  Eli Fidler  <efidler@rim.com>
+
+        Fix OpenGL dependency in CMake build system
+        https://bugs.webkit.org/show_bug.cgi?id=73559
+
+        Reviewed by Daniel Bates.
+
+        Apparently the EFL port uses desktop OpenGL to implement WebGL, but
+        other ports such as BlackBerry use other libraries like OpenGL ES 2.0 or
+        ANGLE.
+
+        * Source/cmake/OptionsCommon.cmake:
+        * Source/cmake/OptionsEfl.cmake:
+
 2012-01-09  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/CMakeLists.txt

@@ -2122 +2122 @@
 IF (ENABLE_WEBGL)
     LIST(APPEND WebCore_INCLUDE_DIRECTORIES
-        ${OPENGL_INCLUDE_DIR}
         ${THIRDPARTY_DIR}/ANGLE/src
         ${THIRDPARTY_DIR}/ANGLE/include
         ${THIRDPARTY_DIR}/ANGLE/include/GLSLANG
         ${WEBCORE_DIR}/platform/graphics/gpu
-    )
-    LIST(APPEND WebCore_LIBRARIES
-        ${OPENGL_gl_LIBRARY}
     )
     LIST(APPEND WebCore_SOURCES

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-11  Eli Fidler  <efidler@rim.com>
+
+        Fix OpenGL dependency in CMake build system
+        https://bugs.webkit.org/show_bug.cgi?id=73559
+
+        Reviewed by Daniel Bates.
+
+        * CMakeLists.txt:
+        * PlatformEfl.cmake:
+
 2012-01-11  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
 

trunk/Source/WebCore/PlatformEfl.cmake

@@ -292 +292 @@
 ENDIF ()
 
+IF (ENABLE_WEBGL)
+  LIST(APPEND WebCore_INCLUDE_DIRECTORIES
+    ${OPENGL_INCLUDE_DIR}
+  )
+  LIST(APPEND WebCore_LIBRARIES
+    ${OPENGL_gl_LIBRARY}
+  )
+ENDIF ()
+
 IF (WTF_USE_SOUP)
   LIST(APPEND WebCore_INCLUDE_DIRECTORIES

trunk/Source/cmake/OptionsCommon.cmake

@@ -15 +15 @@
     SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -P -x c++")
 ENDIF ()
-
-IF (ENABLE_WEBGL)
-    FIND_PACKAGE(OpenGL REQUIRED)
-ENDIF ()

trunk/Source/cmake/OptionsEfl.cmake

@@ -161 +161 @@
 ENDIF()
 
+IF (ENABLE_WEBGL)
+  FIND_PACKAGE(OpenGL REQUIRED)
+ENDIF ()
+
 SET(CPACK_SOURCE_GENERATOR TBZ2)