diff options
| author | Chad Versace <chad.versace@linux.intel.com> | 2012-09-14 00:38:10 +0300 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2012-10-09 19:08:31 -0700 |
| commit | 05c8d2e058af7c63043da9880bc8e88ed66353b1 (patch) | |
| tree | b5521792e0a7339250bac63376e7de7b0ffa025c /cmake | |
| parent | 4072eacd585d084d443a9643bb864160ea71494b (diff) | |
cmake,util: Switch GL tests to use new framework
- Stop building old framework sources, piglit-framework-{fbo,glut}.c.
- Stop building libglut_waffle.
- Wire up piglit_gl_test_run() to use the new framework.
Reviewed-and-tested-by: Jordan Justen <jordan.l.justen@intel.com>
Tested-by: Paul Berry <stereotype441@gmail.com>
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/target_api/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake/target_api/gl/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | cmake/target_api/gles1/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cmake/target_api/gles2/CMakeLists.txt | 1 |
4 files changed, 4 insertions, 8 deletions
diff --git a/cmake/target_api/CMakeLists.txt b/cmake/target_api/CMakeLists.txt index c5e0b904f..8ef89c4a3 100644 --- a/cmake/target_api/CMakeLists.txt +++ b/cmake/target_api/CMakeLists.txt @@ -19,8 +19,8 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -# The no_api directory must precede the GL directories because it builds -# glut_waffle, which the GL targets depend on. +# The no_api directory must precede the GL directories because it may build +# api-independent libraries on which the api-dependent targets rely. add_subdirectory(no_api) add_subdirectory(gl) diff --git a/cmake/target_api/gl/CMakeLists.txt b/cmake/target_api/gl/CMakeLists.txt index b13229de4..0a3c3b79a 100644 --- a/cmake/target_api/gl/CMakeLists.txt +++ b/cmake/target_api/gl/CMakeLists.txt @@ -3,9 +3,7 @@ add_definitions( -DPIGLIT_USE_OPENGL ) -if(PIGLIT_USE_WAFFLE) - link_libraries(glut_waffle) -else(PIGLIT_USE_WAFFLE) +if(NOT PIGLIT_USE_WAFFLE) add_definitions(-DPIGLIT_USE_GLUT) include_directories( ${GLUT_INCLUDE_DIR} @@ -13,7 +11,7 @@ else(PIGLIT_USE_WAFFLE) link_libraries( ${GLUT_glut_LIBRARY} ) -endif(PIGLIT_USE_WAFFLE) +endif() add_subdirectory(${piglit_SOURCE_DIR}/tests ${piglit_BINARY_DIR}/target_api/${piglit_target_api}/tests diff --git a/cmake/target_api/gles1/CMakeLists.txt b/cmake/target_api/gles1/CMakeLists.txt index b76d51bd6..882a2f3ef 100644 --- a/cmake/target_api/gles1/CMakeLists.txt +++ b/cmake/target_api/gles1/CMakeLists.txt @@ -3,7 +3,6 @@ set(piglit_target_api "gles1") add_definitions( -DPIGLIT_USE_OPENGL_ES1 ) -link_libraries(glut_waffle) add_subdirectory(${piglit_SOURCE_DIR}/tests ${piglit_BINARY_DIR}/target_api/${piglit_target_api}/tests ) diff --git a/cmake/target_api/gles2/CMakeLists.txt b/cmake/target_api/gles2/CMakeLists.txt index b8cad2055..ef1e3277f 100644 --- a/cmake/target_api/gles2/CMakeLists.txt +++ b/cmake/target_api/gles2/CMakeLists.txt @@ -3,7 +3,6 @@ set(piglit_target_api "gles2") add_definitions( -DPIGLIT_USE_OPENGL_ES2 ) -link_libraries(glut_waffle) add_subdirectory(${piglit_SOURCE_DIR}/tests ${piglit_BINARY_DIR}/target_api/${piglit_target_api}/tests ) |