diff options
author | Chad Versace <chad.versace@linux.intel.com> | 2013-02-15 13:53:30 -0800 |
---|---|---|
committer | Chad Versace <chad.versace@linux.intel.com> | 2013-11-26 12:32:43 -0800 |
commit | 5b9525f7f48c3a41ef6799650cda92914d7a7e4b (patch) | |
tree | 0e68d98727edf4b4c0677d10a262b5e6074efa40 /tests/egl | |
parent | 99b5f0bc4c3064aa3f50014c63d95851d8fc4491 (diff) |
egl: Fix CMake traversal into egl/spec dir
CMake should traverse into subdirectories independent of the current
API. 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 <chad.versace@linux.intel.com>
Diffstat (limited to 'tests/egl')
-rw-r--r-- | tests/egl/CMakeLists.gl.txt | 2 | ||||
-rw-r--r-- | tests/egl/CMakeLists.gles2.txt | 5 | ||||
-rw-r--r-- | tests/egl/CMakeLists.txt | 1 |
3 files changed, 1 insertions, 7 deletions
diff --git a/tests/egl/CMakeLists.gl.txt b/tests/egl/CMakeLists.gl.txt index 4a2a57c16..f3af96ada 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 11c27c615..000000000 --- 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 144a306f4..c591f8d44 100644 --- a/tests/egl/CMakeLists.txt +++ b/tests/egl/CMakeLists.txt @@ -1 +1,2 @@ piglit_include_target_api() +add_subdirectory(spec) |