summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--tests/glslparsertest/CMakeLists.gles2.txt5
-rw-r--r--tests/spec/arb_transform_feedback2/CMakeLists.gles3.txt7
-rw-r--r--tests/spec/ext_packed_depth_stencil/CMakeLists.gles2.txt7
-rw-r--r--tests/spec/ext_texture_array/CMakeLists.gles3.txt6
-rw-r--r--tests/spec/ext_unpack_subimage/CMakeLists.gles2.txt1
-rw-r--r--tests/spec/glsl-es-3.00/execution/CMakeLists.gles3.txt6
-rw-r--r--tests/spec/khr_debug/CMakeLists.gles2.txt1
-rw-r--r--tests/spec/khr_debug/CMakeLists.gles3.txt1
-rw-r--r--tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles2.txt7
-rw-r--r--tests/util/CMakeLists.gles2.txt1
-rw-r--r--tests/util/CMakeLists.gles3.txt1
12 files changed, 6 insertions, 39 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b20084dd..36b06fc6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -349,8 +349,6 @@ if(PIGLIT_BUILD_GLES3_TESTS AND NOT EGL_FOUND)
"Failed to find EGL library.")
endif()
-find_library(OPENGL_gles2_LIBRARY NAMES GLESv2)
-
# Put all executables into the bin subdirectory
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${piglit_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${piglit_BINARY_DIR}/lib)
diff --git a/tests/glslparsertest/CMakeLists.gles2.txt b/tests/glslparsertest/CMakeLists.gles2.txt
index 1e37bed32..57d4503b2 100644
--- a/tests/glslparsertest/CMakeLists.gles2.txt
+++ b/tests/glslparsertest/CMakeLists.gles2.txt
@@ -1,7 +1,4 @@
-link_libraries(
- piglitutil_${piglit_target_api}
- ${OPENGL_gles2_LIBRARY}
- )
+link_libraries(piglitutil_${piglit_target_api})
piglit_add_executable(glslparsertest_${piglit_target_api}
glslparsertest.c
diff --git a/tests/spec/arb_transform_feedback2/CMakeLists.gles3.txt b/tests/spec/arb_transform_feedback2/CMakeLists.gles3.txt
index cad25bd8d..8c074f1b3 100644
--- a/tests/spec/arb_transform_feedback2/CMakeLists.gles3.txt
+++ b/tests/spec/arb_transform_feedback2/CMakeLists.gles3.txt
@@ -2,12 +2,7 @@ include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
)
-
-link_libraries (
- piglitutil_${piglit_target_api}
- ${OPENGL_gles2_LIBRARY}
-)
-
+link_libraries(piglitutil_${piglit_target_api})
piglit_add_executable (arb_transform_feedback2-change-objects-while-paused_${piglit_target_api} change-objects-while-paused.c)
# vim: ft=cmake:
diff --git a/tests/spec/ext_packed_depth_stencil/CMakeLists.gles2.txt b/tests/spec/ext_packed_depth_stencil/CMakeLists.gles2.txt
index e5cb7630e..0504556e6 100644
--- a/tests/spec/ext_packed_depth_stencil/CMakeLists.gles2.txt
+++ b/tests/spec/ext_packed_depth_stencil/CMakeLists.gles2.txt
@@ -2,12 +2,7 @@ include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
)
-
-link_libraries (
- piglitutil_${piglit_target_api}
- ${OPENGL_gles2_LIBRARY}
-)
-
+link_libraries(piglitutil_${piglit_target_api})
piglit_add_executable (oes_packed_depth_stencil-depth-stencil-texture_${piglit_target_api} depth-stencil-texture.c)
# vim: ft=cmake:
diff --git a/tests/spec/ext_texture_array/CMakeLists.gles3.txt b/tests/spec/ext_texture_array/CMakeLists.gles3.txt
index 2e4da1bc7..68877e3be 100644
--- a/tests/spec/ext_texture_array/CMakeLists.gles3.txt
+++ b/tests/spec/ext_texture_array/CMakeLists.gles3.txt
@@ -1,8 +1,4 @@
-link_libraries(
- piglitutil_${piglit_target_api}
- ${OPENGL_gles2_LIBRARY}
- )
-
+link_libraries(piglitutil_${piglit_target_api})
piglit_add_executable (ext_texture_array-compressed_${piglit_target_api} compressed.c)
# vim: ft=cmake:
diff --git a/tests/spec/ext_unpack_subimage/CMakeLists.gles2.txt b/tests/spec/ext_unpack_subimage/CMakeLists.gles2.txt
index d71240589..57754f089 100644
--- a/tests/spec/ext_unpack_subimage/CMakeLists.gles2.txt
+++ b/tests/spec/ext_unpack_subimage/CMakeLists.gles2.txt
@@ -6,7 +6,6 @@ include_directories(
link_libraries(
${EGL_LDFLAGS}
- ${OPENGL_gles2_LIBRARY}
piglitutil_gles2
)
diff --git a/tests/spec/glsl-es-3.00/execution/CMakeLists.gles3.txt b/tests/spec/glsl-es-3.00/execution/CMakeLists.gles3.txt
index 42f6f1180..c330ce316 100644
--- a/tests/spec/glsl-es-3.00/execution/CMakeLists.gles3.txt
+++ b/tests/spec/glsl-es-3.00/execution/CMakeLists.gles3.txt
@@ -1,8 +1,4 @@
-link_libraries(
- piglitutil_${piglit_target_api}
- ${OPENGL_gles2_LIBRARY}
- )
-
+link_libraries(piglitutil_${piglit_target_api})
piglit_add_executable (varying-struct-centroid_${piglit_target_api} varying-struct-centroid.c)
# vim: ft=cmake:
diff --git a/tests/spec/khr_debug/CMakeLists.gles2.txt b/tests/spec/khr_debug/CMakeLists.gles2.txt
index e132cad07..b0e7115d2 100644
--- a/tests/spec/khr_debug/CMakeLists.gles2.txt
+++ b/tests/spec/khr_debug/CMakeLists.gles2.txt
@@ -5,7 +5,6 @@ include_directories(
link_libraries (
piglitutil_${piglit_target_api}
- ${OPENGL_gles2_LIBRARY}
${EGL_LDFLAGS}
)
diff --git a/tests/spec/khr_debug/CMakeLists.gles3.txt b/tests/spec/khr_debug/CMakeLists.gles3.txt
index e132cad07..b0e7115d2 100644
--- a/tests/spec/khr_debug/CMakeLists.gles3.txt
+++ b/tests/spec/khr_debug/CMakeLists.gles3.txt
@@ -5,7 +5,6 @@ include_directories(
link_libraries (
piglitutil_${piglit_target_api}
- ${OPENGL_gles2_LIBRARY}
${EGL_LDFLAGS}
)
diff --git a/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles2.txt b/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles2.txt
index 894bd5829..84ef55084 100644
--- a/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles2.txt
+++ b/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles2.txt
@@ -2,10 +2,5 @@ include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
)
-
-link_libraries(
- piglitutil_${piglit_target_api}
- ${OPENGL_gles2_LIBRARY}
-)
-
+link_libraries(piglitutil_${piglit_target_api})
piglit_add_executable(oes_compressed_etc1_rgb8_texture-miptree oes_compressed_etc1_rgb8_texture-miptree.c)
diff --git a/tests/util/CMakeLists.gles2.txt b/tests/util/CMakeLists.gles2.txt
index a17411220..2ce87e5c6 100644
--- a/tests/util/CMakeLists.gles2.txt
+++ b/tests/util/CMakeLists.gles2.txt
@@ -15,7 +15,6 @@ include_directories(
link_libraries(
${UTIL_GL_LIBS}
- ${OPENGL_gles2_LIBRARY}
piglitutil_${piglit_target_api}
)
diff --git a/tests/util/CMakeLists.gles3.txt b/tests/util/CMakeLists.gles3.txt
index 59a4de7a5..9572b59bf 100644
--- a/tests/util/CMakeLists.gles3.txt
+++ b/tests/util/CMakeLists.gles3.txt
@@ -14,7 +14,6 @@ include_directories(
link_libraries(
${UTIL_GL_LIBS}
- ${OPENGL_gles2_LIBRARY}
piglitutil_${piglit_target_api}
)