Module: Demos Branch: master Commit: 0009b2a7de4f3c112473aa371e097ae82990ddcb URL: http://cgit.freedesktop.org/mesa/demos/commit/?id=0009b2a7de4f3c112473aa371e097ae82990ddcb
Author: José Fonseca <[email protected]> Date: Sun Nov 6 11:41:26 2011 +0000 cmake: Fix build w/ EGL. --- src/egl/eglut/CMakeLists.txt | 4 ++-- src/egl/opengl/CMakeLists.txt | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/egl/eglut/CMakeLists.txt b/src/egl/eglut/CMakeLists.txt index 76d48df..b97caa6 100644 --- a/src/egl/eglut/CMakeLists.txt +++ b/src/egl/eglut/CMakeLists.txt @@ -1,7 +1,7 @@ if(X11_FOUND) add_library(eglut_x11 eglut.h eglut.c eglutint.h eglut_x11.c) - target_link_libraries(eglut_x11 ${OPENGL_gl_LIBRARY}) + target_link_libraries(eglut_x11 ${EGL_egl_LIBRARY}) endif(X11_FOUND) add_library(eglut_screen eglut.h eglut.c eglutint.h eglut_screen.c) -target_link_libraries(eglut_screen ${OPENGL_gl_LIBRARY}) +target_link_libraries(eglut_screen ${EGL_egl_LIBRARY}) diff --git a/src/egl/opengl/CMakeLists.txt b/src/egl/opengl/CMakeLists.txt index a8b9d02..8883bbb 100644 --- a/src/egl/opengl/CMakeLists.txt +++ b/src/egl/opengl/CMakeLists.txt @@ -3,14 +3,18 @@ include_directories(${EGL_INCLUDE_DIR} ../../util ) +link_libraries ( + ${EGL_egl_LIBRARY} + ${OPENGL_gl_LIBRARY} +) + add_executable(eglinfo eglinfo.c) -target_link_libraries(eglinfo ${EGL_egl_LIBRARY}) add_executable(eglgears_screen eglgears.c) -target_link_libraries(eglgears_screen ${EGL_egl_LIBRARY} eglut_screen) +target_link_libraries(eglgears_screen eglut_screen) if(X11_FOUND) - add_executable(eglgears_x11 eglgears.c) - target_link_libraries(eglgears_x11 ${EGL_egl_LIBRARY} eglut_x11) + add_executable(eglgears_x11 eglgears.c) + target_link_libraries(eglgears_x11 eglut_x11) endif(X11_FOUND) _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
