Commit c55e20f2 authored by Chad Versace's avatar Chad Versace

cmake: Temporarily disable building GLES2 targets

In order to add proper GLES2 support to the build system, the CMake files
must undergo significant change.  Disabling GLES2 targets is necessary in
order to prevent breaking the build during that CMake upheaval.

Note: This belongs to a series that adds GLES2 support to Piglit.
Signed-off-by: default avatarChad Versace <chad.versace@intel.com>
parent 961e2f3f
......@@ -13,10 +13,11 @@ add_subdirectory (spec)
IF(OPENGL_egl_LIBRARY)
add_subdirectory (egl)
IF(OPENGL_gles2_LIBRARY)
add_subdirectory (gles2)
add_subdirectory (gles2parsertest)
ENDIF(OPENGL_gles2_LIBRARY)
# Temporarily disable building GLES2 targets.
#IF(OPENGL_gles2_LIBRARY)
# add_subdirectory (gles2)
# add_subdirectory (gles2parsertest)
#ENDIF(OPENGL_gles2_LIBRARY)
ENDIF(OPENGL_egl_LIBRARY)
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
......
add_definitions ( -DSOURCE_DIR="${piglit_SOURCE_DIR}/" )
# -------------------------------------------
# Temporarily disable building GLES2 targets.
# -------------------------------------------
include_directories(
${OPENGL_INCLUDE_PATH}
${piglit_SOURCE_DIR}/tests/util/
${piglit_SOURCE_DIR}/tests/util/glut_egl
)
link_libraries (
${OPENGL_gles2_LIBRARY}
${OPENGL_egl_LIBRARY}
piglitglutegl_x11
piglitegl_gles2util
)
add_executable (gles2_shader_runner gles2_shader_runner.c ../util/shader-load.c)
target_link_libraries(gles2_shader_runner X11)
#add_definitions ( -DSOURCE_DIR="${piglit_SOURCE_DIR}/" )
#
#include_directories(
# ${OPENGL_INCLUDE_PATH}
# ${piglit_SOURCE_DIR}/tests/util/
# ${piglit_SOURCE_DIR}/tests/util/glut_egl
#)
#
#link_libraries (
# ${OPENGL_gles2_LIBRARY}
# ${OPENGL_egl_LIBRARY}
# piglitglutegl_x11
# piglitegl_gles2util
#)
#
#add_executable (gles2_shader_runner gles2_shader_runner.c ../util/shader-load.c)
#target_link_libraries(gles2_shader_runner X11)
add_definitions ( -DSOURCE_DIR="${piglit_SOURCE_DIR}/" )
# -------------------------------------------
# Temporarily disable building GLES2 targets.
# -------------------------------------------
include_directories(
${OPENGL_INCLUDE_PATH}
${piglit_SOURCE_DIR}/tests/util/
${piglit_SOURCE_DIR}/tests/util/glut_egl
)
link_directories (
${piglit_SOURCE_DIR}/tests/util/
${piglit_SOURCE_DIR}/tests/util/glut_egl
)
link_libraries (
${OPENGLES_gles2_LIBRARY}
${OPENGL_egl_LIBRARY}
piglitglutegl_x11
piglitegl_gles2util
)
add_executable (gles2parsertest gles2parsertest.c)
target_link_libraries(gles2parsertest X11)
#add_definitions ( -DSOURCE_DIR="${piglit_SOURCE_DIR}/" )
#
#include_directories(
# ${OPENGL_INCLUDE_PATH}
# ${piglit_SOURCE_DIR}/tests/util/
# ${piglit_SOURCE_DIR}/tests/util/glut_egl
#)
#
#link_directories (
# ${piglit_SOURCE_DIR}/tests/util/
# ${piglit_SOURCE_DIR}/tests/util/glut_egl
#)
#
#link_libraries (
# ${OPENGLES_gles2_LIBRARY}
# ${OPENGL_egl_LIBRARY}
# piglitglutegl_x11
# piglitegl_gles2util
#)
#
#
#add_executable (gles2parsertest gles2parsertest.c)
#target_link_libraries(gles2parsertest X11)
......@@ -44,21 +44,22 @@ if(UNIX)
target_link_libraries(piglitutil m)
endif(UNIX)
IF(OPENGL_egl_LIBRARY)
add_subdirectory (glut_egl)
add_library (piglitegl_gles2util
piglit-egl-gles2-framework.c
piglit-gles2-util.c
piglit-shared-util.c
)
add_library (piglitegl_glutil
fdo-bitmap.c
piglit-egl-gl-framework.c
piglit-util.c
piglit-shared-util.c
)
target_link_libraries(piglitegl_gles2util ${OPENGL_gles2_LIBRARY} piglitglutegl_x11)
set_target_properties ( piglitegl_gles2util
PROPERTIES COMPILE_DEFINITIONS "PIGLIT_GLES2")
target_link_libraries(piglitegl_glutil ${OPENGL_gl_LIBRARY} piglitglutegl_x11)
ENDIF(OPENGL_egl_LIBRARY)
# Temporarily disable building GLES2 targets.
#IF(OPENGL_egl_LIBRARY)
# add_subdirectory (glut_egl)
# add_library (piglitegl_gles2util
# piglit-egl-gles2-framework.c
# piglit-gles2-util.c
# piglit-shared-util.c
# )
# add_library (piglitegl_glutil
# fdo-bitmap.c
# piglit-egl-gl-framework.c
# piglit-util.c
# piglit-shared-util.c
# )
# target_link_libraries(piglitegl_gles2util ${OPENGL_gles2_LIBRARY} piglitglutegl_x11)
# set_target_properties ( piglitegl_gles2util
# PROPERTIES COMPILE_DEFINITIONS "PIGLIT_GLES2")
# target_link_libraries(piglitegl_glutil ${OPENGL_gl_LIBRARY} piglitglutegl_x11)
#ENDIF(OPENGL_egl_LIBRARY)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment