From 177aa7b7d956619f7200c73fdc226f9360ba4394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 27 Sep 2015 21:37:48 +0200 Subject: [PATCH] modules: support ANGLE in FindOpenGLES2/3 and FindEGL CMake modules. It has lib prefix even on Windows, making it unfindable for CMake. --- modules/FindEGL.cmake | 4 +++- modules/FindOpenGLES2.cmake | 1 + modules/FindOpenGLES3.cmake | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/FindEGL.cmake b/modules/FindEGL.cmake index 65f776a48..6f8c99916 100644 --- a/modules/FindEGL.cmake +++ b/modules/FindEGL.cmake @@ -33,7 +33,9 @@ # # Library -find_library(EGL_LIBRARY EGL) +find_library(EGL_LIBRARY NAMES + EGL + libEGL) # ANGLE (CMake doesn't search for lib prefix on Windows) # Include dir find_path(EGL_INCLUDE_DIR diff --git a/modules/FindOpenGLES2.cmake b/modules/FindOpenGLES2.cmake index 103268be9..179a53742 100644 --- a/modules/FindOpenGLES2.cmake +++ b/modules/FindOpenGLES2.cmake @@ -37,6 +37,7 @@ if(NOT CORRADE_TARGET_EMSCRIPTEN) find_library(OPENGLES2_LIBRARY NAMES GLESv2 + libGLESv2 # ANGLE (CMake doesn't search for lib prefix on Windows) ppapi_gles2) # NaCl set(OPENGLES2_LIBRARY_NEEDED OPENGLES2_LIBRARY) endif() diff --git a/modules/FindOpenGLES3.cmake b/modules/FindOpenGLES3.cmake index c7179bcb6..2d07aa5b4 100644 --- a/modules/FindOpenGLES3.cmake +++ b/modules/FindOpenGLES3.cmake @@ -40,7 +40,9 @@ if(NOT CORRADE_TARGET_EMSCRIPTEN) # On some platforms (e.g. desktop emulation with Mesa or NVidia) ES3 # support is provided in ES2 lib - GLESv2) + GLESv2 + + libGLESv2) # ANGLE (CMake doesn't search for lib prefix on Windows) set(OPENGLES3_LIBRARY_NEEDED OPENGLES3_LIBRARY) endif()