Many EGL tests make no GL calls. This is one step towards enabling those tests on platforms lacking desktop OpenGL, such as Android.
Signed-off-by: Chad Versace <[email protected]> --- tests/util/CMakeLists.no_api.txt | 12 ++++++++++++ tests/util/CMakeLists.txt | 11 ----------- tests/util/piglit-util-egl.h | 3 +-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/util/CMakeLists.no_api.txt b/tests/util/CMakeLists.no_api.txt index c331368..41d0e6d 100644 --- a/tests/util/CMakeLists.no_api.txt +++ b/tests/util/CMakeLists.no_api.txt @@ -2,6 +2,12 @@ include_directories( ${UTIL_INCLUDES} ) +if(OPENGL_egl_LIBRARY) + list(APPEND UTIL_SOURCES + piglit-util-egl.c + ) +endif() + piglit_add_library (piglitutil ${UTIL_SOURCES} ) @@ -10,4 +16,10 @@ if(UNIX) target_link_libraries(piglitutil m) endif(UNIX) +if(OPENGL_egl_LIBRARY) + target_link_libraries(piglitutil + ${OPENGL_egl_LIBRARY} + ) +endif() + # vim: ft=cmake: diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt index cbcf050..fcd76a3 100644 --- a/tests/util/CMakeLists.txt +++ b/tests/util/CMakeLists.txt @@ -57,15 +57,4 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") ) endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") -if(OPENGL_egl_LIBRARY) - set(UTIL_GL_SOURCES - ${UTIL_GL_SOURCES} - piglit-util-egl.c - ) - set(UTIL_GL_LIBS - ${UTIL_GL_LIBS} - ${OPENGL_egl_LIBRARY} - ) -endif(OPENGL_egl_LIBRARY) - piglit_include_target_api() diff --git a/tests/util/piglit-util-egl.h b/tests/util/piglit-util-egl.h index 7faccf4..09b9664 100644 --- a/tests/util/piglit-util-egl.h +++ b/tests/util/piglit-util-egl.h @@ -24,8 +24,7 @@ #pragma once #include <EGL/egl.h> - -#include "piglit-util-gl-common.h" +#include "piglit-util.h" #ifdef __cplusplus extern "C" { -- 1.8.1.1 _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
