Title: [271139] trunk/Source/ThirdParty/ANGLE
- Revision
- 271139
- Author
- hironori.fu...@sony.com
- Date
- 2021-01-04 15:17:51 -0800 (Mon, 04 Jan 2021)
Log Message
[WinCairo][CMake][MSBuild][ANGLE] entry_points_*.h was generated twice both in LibGLESv2EntryPointsHeaders and GLESv2 projects
https://bugs.webkit.org/show_bug.cgi?id=220251
Reviewed by Kenneth Russell.
WinCairo port is supporting both CMake Visual Studio generator and
Ninja generator. However, CMake Visual Studio builds was failing
as the following error.
> ANGLE\Headers\ANGLE/entry_points_egl.h(13,10): fatal error C1083: Cannot open include file: 'export.h': No such file or directory (compiling source file ...\texmap\ANGLEContext.cpp)
entry_points_egl.h was generated twice both in
LibGLESv2EntryPointsHeaders and GLESv2 projects. However, the
post-process script adjust-angle-include-paths.py was invoked only
in LibGLESv2EntryPointsHeaders project.
GLESv2 target needs to have a direct or indirect dependency to
LibGLESv2EntryPointsHeaders target for CMake Visual Studio
generator to eliminate duplicated custom commands.
* CMakeLists.txt: Added add_dependencies(GLESv2 LibGLESv2EntryPointsHeaders) only if WIN32.
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/CMakeLists.txt (271138 => 271139)
--- trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2021-01-04 22:54:49 UTC (rev 271138)
+++ trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2021-01-04 23:17:51 UTC (rev 271139)
@@ -181,6 +181,13 @@
FILES ${libglesv2_entry_points_headers}
FLATTENED
)
+ if (WIN32 AND TARGET GLESv2)
+ # GLESv2 needs to have a direct or indirect dependency to
+ # LibGLESv2EntryPointsHeaders for CMake Visual Studio generator
+ # to eliminate duplicated custom commands. Otherwise,
+ # entry_points_*.h will be copied twice in both projects.
+ add_dependencies(GLESv2 LibGLESv2EntryPointsHeaders)
+ endif ()
add_custom_target(ANGLE-webgl-headers
DEPENDS LibGLESv2EntryPointsHeaders ANGLEWebGLHeaders
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (271138 => 271139)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-01-04 22:54:49 UTC (rev 271138)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-01-04 23:17:51 UTC (rev 271139)
@@ -1,3 +1,27 @@
+2021-01-04 Fujii Hironori <hironori.fu...@sony.com>
+
+ [WinCairo][CMake][MSBuild][ANGLE] entry_points_*.h was generated twice both in LibGLESv2EntryPointsHeaders and GLESv2 projects
+ https://bugs.webkit.org/show_bug.cgi?id=220251
+
+ Reviewed by Kenneth Russell.
+
+ WinCairo port is supporting both CMake Visual Studio generator and
+ Ninja generator. However, CMake Visual Studio builds was failing
+ as the following error.
+
+ > ANGLE\Headers\ANGLE/entry_points_egl.h(13,10): fatal error C1083: Cannot open include file: 'export.h': No such file or directory (compiling source file ...\texmap\ANGLEContext.cpp)
+
+ entry_points_egl.h was generated twice both in
+ LibGLESv2EntryPointsHeaders and GLESv2 projects. However, the
+ post-process script adjust-angle-include-paths.py was invoked only
+ in LibGLESv2EntryPointsHeaders project.
+
+ GLESv2 target needs to have a direct or indirect dependency to
+ LibGLESv2EntryPointsHeaders target for CMake Visual Studio
+ generator to eliminate duplicated custom commands.
+
+ * CMakeLists.txt: Added add_dependencies(GLESv2 LibGLESv2EntryPointsHeaders) only if WIN32.
+
2021-01-02 James Darpinian <jdarpin...@chromium.org>
Enable some ANGLE workarounds on iOS
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
