Changeset 278726 in webkit

Timestamp:

Jun 10, 2021, 1:17:19 PM (4 years ago)

Author:

don.olmstead@sony.com

Message:

[CMake] Make ANGLE library types configurable
​https://bugs.webkit.org/show_bug.cgi?id=226840

Reviewed by Kenneth Russell.

The type for ANGLE's libraries was being hard coded. Now the libraries can be set by
specifying the _LIBRARY_TYPE which defaults to STATIC. Windows platforms override this
and use SHARED libraries.

Additionally make compiling ANGLE's EGL library contingent on USE_ANGLE_EGL being enabled
since its not used otherwise.

• CMakeLists.txt:
• PlatformFTW.cmake:
• PlatformWin.cmake:

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• CMakeLists.txt (modified) (4 diffs)
• ChangeLog (modified) (1 diff)
• PlatformFTW.cmake (modified) (1 diff)
• PlatformWin.cmake (modified) (1 diff)

trunk/Source/ThirdParty/ANGLE/CMakeLists.txt

@@ -34 +34 @@
     EGL_EGLEXT_PROTOTYPES
 )
+
+# Default library types for ANGLE
+# Override these in Platform*.cmake for your port as needed.
+set(ANGLE_LIBRARY_TYPE STATIC)
+set(GLESv2_LIBRARY_TYPE STATIC)
+set(EGL_LIBRARY_TYPE STATIC)
 
 # ANGLE makes a number of small static libraries that are then joined into a
@@ -119 +125 @@
 
 if (USE_ANGLE_EGL OR USE_ANGLE_WEBGL)
-    add_library(ANGLE STATIC
+    add_library(ANGLE ${ANGLE_LIBRARY_TYPE}
         ${ANGLE_SOURCES}
         ${libangle_sources}
@@ -138 +144 @@
     target_compile_definitions(ANGLEFramework INTERFACE ${gl_prototypes})
 
-    add_library(GLESv2 SHARED
+    add_library(GLESv2 ${GLESv2_LIBRARY_TYPE}
         ${libglesv2_sources}
     )
@@ -147 +153 @@
     )
     target_link_libraries(GLESv2 PRIVATE ${ANGLEGLESv2_LIBRARIES})
+    if (WIN32)
+        # Output library name according to the .def
+        target_sources(GLESv2 PRIVATE src/libGLESv2/libGLESv2_autogen.def)
+        set_target_properties(GLESv2 PROPERTIES OUTPUT_NAME libGLESv2)
+    endif ()
 
     add_library(GLESv2Framework INTERFACE)
     target_link_libraries(GLESv2Framework INTERFACE GLESv2)
     target_include_directories(GLESv2Framework INTERFACE ${ANGLE_FRAMEWORK_HEADERS_DIR})
+    target_compile_definitions(GLESv2Framework INTERFACE USE_SYSTEM_EGL)
     add_library(ANGLE::GLES ALIAS GLESv2Framework)
 
-    add_library(EGL SHARED
-        ${libegl_sources}
-    )
-    target_include_directories(EGL PRIVATE ${ANGLE_PRIVATE_INCLUDE_DIRECTORIES})
-    target_compile_definitions(EGL PRIVATE
-        ${ANGLE_DEFINITIONS}
-        ${gl_prototypes}
-        EGLAPI=
-    )
-    target_link_libraries(EGL PRIVATE GLESv2)
-    set_target_properties(EGL PROPERTIES LINKER_LANGUAGE CXX)
-
-    add_library(EGLFramework INTERFACE)
-    target_include_directories(EGLFramework INTERFACE ${ANGLE_FRAMEWORK_HEADERS_DIR}/)
-    target_compile_definitions(EGLFramework INTERFACE ${gl_prototypes})
-    target_link_libraries(EGLFramework INTERFACE EGL)
-    add_library(ANGLE::EGL ALIAS EGLFramework)
-
-    if (WIN32)
-        target_sources(GLESv2 PRIVATE src/libGLESv2/libGLESv2_autogen.def)
-        target_sources(EGL PRIVATE src/libEGL/libEGL.def)
-
-        # Output library names according to the .def
-        set_target_properties(GLESv2 PROPERTIES OUTPUT_NAME libGLESv2)
-        set_target_properties(EGL PROPERTIES OUTPUT_NAME libEGL)
+    if (USE_ANGLE_EGL)
+        add_library(EGL ${EGL_LIBRARY_TYPE}
+            ${libegl_sources}
+        )
+        target_include_directories(EGL PRIVATE ${ANGLE_PRIVATE_INCLUDE_DIRECTORIES})
+        target_compile_definitions(EGL PRIVATE
+            ${ANGLE_DEFINITIONS}
+            ${gl_prototypes}
+            EGLAPI=
+        )
+        target_link_libraries(EGL PRIVATE GLESv2)
+        set_target_properties(EGL PROPERTIES LINKER_LANGUAGE CXX)
+        if (WIN32)
+            # Output library names according to the .def
+            target_sources(EGL PRIVATE src/libEGL/libEGL.def)
+            set_target_properties(EGL PROPERTIES OUTPUT_NAME libEGL)
+        endif ()
+
+        add_library(EGLFramework INTERFACE)
+        target_include_directories(EGLFramework INTERFACE ${ANGLE_FRAMEWORK_HEADERS_DIR}/)
+        target_compile_definitions(EGLFramework INTERFACE ${gl_prototypes})
+        target_link_libraries(EGLFramework INTERFACE EGL)
+        add_library(ANGLE::EGL ALIAS EGLFramework)
     endif ()
 else ()
-    add_library(ANGLE STATIC ${ANGLE_SOURCES})
+    add_library(ANGLE ${ANGLE_LIBRARY_TYPE} ${ANGLE_SOURCES})
     target_include_directories(ANGLE PRIVATE ${ANGLE_PRIVATE_INCLUDE_DIRECTORIES})
     target_link_libraries(ANGLE PRIVATE ${CMAKE_DL_LIBS})

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2021-06-10  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Make ANGLE library types configurable
+        https://bugs.webkit.org/show_bug.cgi?id=226840
+
+        Reviewed by Kenneth Russell.
+
+        The type for ANGLE's libraries was being hard coded. Now the libraries can be set by
+        specifying the _LIBRARY_TYPE which defaults to STATIC. Windows platforms override this
+        and use SHARED libraries.
+
+        Additionally make compiling ANGLE's EGL library contingent on USE_ANGLE_EGL being enabled
+        since its not used otherwise.
+
+        * CMakeLists.txt:
+        * PlatformFTW.cmake:
+        * PlatformWin.cmake:
+
 2021-06-02  Kyle Piddington  <kpiddington@apple.com>
 

trunk/Source/ThirdParty/ANGLE/PlatformFTW.cmake

@@ -30 +30 @@
 list(APPEND ANGLE_DEFINITIONS ANGLE_ENABLE_D3D9)
 list(APPEND ANGLEGLESv2_LIBRARIES d3d9)
+
+# Use shared libraries
+set(GLESv2_LIBRARY_TYPE SHARED)
+set(EGL_LIBRARY_TYPE SHARED)

trunk/Source/ThirdParty/ANGLE/PlatformWin.cmake

@@ -30 +30 @@
 list(APPEND ANGLE_DEFINITIONS ANGLE_ENABLE_D3D9)
 list(APPEND ANGLEGLESv2_LIBRARIES d3d9)
+
+# Use shared libraries
+set(GLESv2_LIBRARY_TYPE SHARED)
+set(EGL_LIBRARY_TYPE SHARED)