third_party
/
libepoxy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix "FindGLESv1.cmake" and "FindGLESv2.cmake".

Browse Source
macos/v1.5.9
Yaron Cohen-Tal 9 years ago
parent 44d51f2844
commit 2af1715fbf
3 changed files with 8 additions and 8 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      cmake/FindGLESv1.cmake
  2. 4
      cmake/FindGLESv2.cmake
  3. 6
      test/CMakeLists.txt

6
cmake/FindGLESv1.cmake
Unescape View File

@ -1,12 +1,12 @@
# Find GLESv1 # Find GLESv1
# #
# GLESv1_LIBRARY # 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) find_library (GLESv1_LIBRARY NAMES ${GLESv1_NAMES} PATHS /opt/vc/lib)
include(FindPackageHandleStandardArgs) 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) mark_as_advanced (GLESv1_LIBRARY)

4
cmake/FindGLESv2.cmake
Unescape View File

@ -1,12 +1,12 @@
# Find GLESv2 # Find GLESv2
# #
# GLESv2_LIBRARY # GLESv2_LIBRARY
# GLESv2_FOUND # GLES_V2_FOUND
set (GLESv2_NAMES ${GLESv2_NAMES} GLESv2 libGLESv2) set (GLESv2_NAMES ${GLESv2_NAMES} GLESv2 libGLESv2)
find_library (GLESv2_LIBRARY NAMES ${GLESv2_NAMES} PATHS /opt/vc/lib) find_library (GLESv2_LIBRARY NAMES ${GLESv2_NAMES} PATHS /opt/vc/lib)
include (FindPackageHandleStandardArgs) 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) mark_as_advanced (GLESv2_LIBRARY)

6
test/CMakeLists.txt
Unescape View File

@ -88,11 +88,11 @@ if (EPOXY_BUILD_TESTS)
epoxy_add_test (egl_has_extension_nocontext "${EPOXY_EGL_TESTS_COMMON};egl_has_extension_nocontext.c" epoxy_add_test (egl_has_extension_nocontext "${EPOXY_EGL_TESTS_COMMON};egl_has_extension_nocontext.c"
"${X11_LIBRARIES}") "${X11_LIBRARIES}")
epoxy_add_test (egl_gl "${EPOXY_EGL_TESTS_COMMON};egl_gl.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}" epoxy_add_test (egl_gles1_without_glx "${EPOXY_EGL_TESTS_COMMON};egl_without_glx.c" "${X11_LIBRARIES}"
"GLES_VERSION=1") "GLES_VERSION=1")
endif () 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}" epoxy_add_test (egl_gles2_without_glx "${EPOXY_EGL_TESTS_COMMON};egl_without_glx.c" "${X11_LIBRARIES}"
"GLES_VERSION=2") "GLES_VERSION=2")
endif () endif ()
@ -115,7 +115,7 @@ if (EPOXY_BUILD_TESTS)
epoxy_add_test (glx_alias_prefer_same_name epoxy_add_test (glx_alias_prefer_same_name
"${EPOXY_GLX_TESTS_COMMON};glx_alias_prefer_same_name.c;dlwrap.c;dlwrap.h" "${X11_LIBRARIES}" "${EPOXY_GLX_TESTS_COMMON};glx_alias_prefer_same_name.c;dlwrap.c;dlwrap.h" "${X11_LIBRARIES}"
"" "-rdynamic") "" "-rdynamic")
if (GLESv2_FOUND) if (GLES_V2_FOUND)
epoxy_add_test (test_glx_gles2 epoxy_add_test (test_glx_gles2
"${EPOXY_GLX_TESTS_COMMON};glx_gles2.c;dlwrap.c;dlwrap.h" "${X11_LIBRARIES}" "" "-rdynamic") "${EPOXY_GLX_TESTS_COMMON};glx_gles2.c;dlwrap.c;dlwrap.h" "${X11_LIBRARIES}" "" "-rdynamic")
endif () endif ()

Write Preview
Loading…
Cancel
Save