From 2af1715fbf5e7a9508bec01e70ec6bba8ec5204b Mon Sep 17 00:00:00 2001 From: Yaron Cohen-Tal Date: Fri, 4 Sep 2015 12:51:13 +0300 Subject: [PATCH] Fix "FindGLESv1.cmake" and "FindGLESv2.cmake". --- cmake/FindGLESv1.cmake | 6 +++--- cmake/FindGLESv2.cmake | 4 ++-- test/CMakeLists.txt | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/FindGLESv1.cmake b/cmake/FindGLESv1.cmake index 4bc5b7b..23314a3 100644 --- a/cmake/FindGLESv1.cmake +++ b/cmake/FindGLESv1.cmake @@ -1,12 +1,12 @@ # Find GLESv1 # # GLESv1_LIBRARY -# GLESv1_FOUND +# GLES_V1_FOUND -set(GLESv1_NAMES ${GLESv1_NAMES} GLESv1_CM libGLES_CM) +set(GLESv1_NAMES ${GLESv1_NAMES} GLES_CM GLESv1_CM libGLES_CM) find_library (GLESv1_LIBRARY NAMES ${GLESv1_NAMES} PATHS /opt/vc/lib) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args (GLESv1 DEFAULT_MSG GLESv1_LIBRARY) +find_package_handle_standard_args (GLES_V1 DEFAULT_MSG GLESv1_LIBRARY) mark_as_advanced (GLESv1_LIBRARY) diff --git a/cmake/FindGLESv2.cmake b/cmake/FindGLESv2.cmake index f2f7671..7476212 100644 --- a/cmake/FindGLESv2.cmake +++ b/cmake/FindGLESv2.cmake @@ -1,12 +1,12 @@ # Find GLESv2 # # GLESv2_LIBRARY -# GLESv2_FOUND +# GLES_V2_FOUND set (GLESv2_NAMES ${GLESv2_NAMES} GLESv2 libGLESv2) find_library (GLESv2_LIBRARY NAMES ${GLESv2_NAMES} PATHS /opt/vc/lib) include (FindPackageHandleStandardArgs) -find_package_handle_standard_args (GLESv2 DEFAULT_MSG GLESv2_LIBRARY) +find_package_handle_standard_args (GLES_V2 DEFAULT_MSG GLESv2_LIBRARY) mark_as_advanced (GLESv2_LIBRARY) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index ef3511b..f23e9e7 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -88,11 +88,11 @@ if (EPOXY_BUILD_TESTS) epoxy_add_test (egl_has_extension_nocontext "${EPOXY_EGL_TESTS_COMMON};egl_has_extension_nocontext.c" "${X11_LIBRARIES}") epoxy_add_test (egl_gl "${EPOXY_EGL_TESTS_COMMON};egl_gl.c" "${X11_LIBRARIES}") - if (GLESv1_FOUND) + if (GLES_V1_FOUND) epoxy_add_test (egl_gles1_without_glx "${EPOXY_EGL_TESTS_COMMON};egl_without_glx.c" "${X11_LIBRARIES}" "GLES_VERSION=1") endif () - if (GLESv2_FOUND) + if (GLES_V2_FOUND) epoxy_add_test (egl_gles2_without_glx "${EPOXY_EGL_TESTS_COMMON};egl_without_glx.c" "${X11_LIBRARIES}" "GLES_VERSION=2") endif () @@ -115,7 +115,7 @@ if (EPOXY_BUILD_TESTS) epoxy_add_test (glx_alias_prefer_same_name "${EPOXY_GLX_TESTS_COMMON};glx_alias_prefer_same_name.c;dlwrap.c;dlwrap.h" "${X11_LIBRARIES}" "" "-rdynamic") - if (GLESv2_FOUND) + if (GLES_V2_FOUND) epoxy_add_test (test_glx_gles2 "${EPOXY_GLX_TESTS_COMMON};glx_gles2.c;dlwrap.c;dlwrap.h" "${X11_LIBRARIES}" "" "-rdynamic") endif ()