CMake should traverse into subdirectories independent of the current OpenGL. That is, the generic CMakeLists.txt should call add_subdirectory(xxx), not the api-specific CMakeLists.$api.txt. For precedent, see tests/spec/CMakeLists.txt.
Signed-off-by: Chad Versace <[email protected]> --- tests/egl/CMakeLists.gl.txt | 2 -- tests/egl/CMakeLists.gles2.txt | 5 ----- tests/egl/CMakeLists.txt | 1 + 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 tests/egl/CMakeLists.gles2.txt diff --git a/tests/egl/CMakeLists.gl.txt b/tests/egl/CMakeLists.gl.txt index 03b2ae0..fb73248 100644 --- a/tests/egl/CMakeLists.gl.txt +++ b/tests/egl/CMakeLists.gl.txt @@ -20,8 +20,6 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") target_link_libraries(egl-create-surface pthread ${X11_X11_LIB}) piglit_add_executable (egl-query-surface egl-util.c egl-query-surface.c) target_link_libraries(egl-query-surface pthread ${X11_X11_LIB}) - - add_subdirectory(spec) ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") # vim: ft=cmake: diff --git a/tests/egl/CMakeLists.gles2.txt b/tests/egl/CMakeLists.gles2.txt deleted file mode 100644 index 11c27c6..0000000 --- a/tests/egl/CMakeLists.gles2.txt +++ /dev/null @@ -1,5 +0,0 @@ -IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - add_subdirectory(spec) -ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - -# vim: ft=cmake: diff --git a/tests/egl/CMakeLists.txt b/tests/egl/CMakeLists.txt index 144a306..c591f8d 100644 --- a/tests/egl/CMakeLists.txt +++ b/tests/egl/CMakeLists.txt @@ -1 +1,2 @@ piglit_include_target_api() +add_subdirectory(spec) -- 1.8.3.1 _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
