Module: Demos Branch: master Commit: 4740962280d8906334e7e2b3096315cd3fbe1b16 URL: http://cgit.freedesktop.org/mesa/demos/commit/?id=4740962280d8906334e7e2b3096315cd3fbe1b16
Author: José Fonseca <[email protected]> Date: Tue Aug 2 21:33:18 2011 +0100 Revert "cmake: Allow to specify glext headers include path." I ran into build failures due to missing GL_UNSIGNED_INT_2_10_10_10_REV symbol, but it was caused by old glew headers, not old glext headers. So take this back until it actually makes a difference. This reverts commit 838c703bb9be6d89a226f2239dbb44c85d53da57. --- CMakeLists.txt | 14 -------------- src/demos/CMakeLists.txt | 1 - src/fp/CMakeLists.txt | 1 - src/fpglsl/CMakeLists.txt | 1 - src/glsl/CMakeLists.txt | 1 - src/gs/CMakeLists.txt | 1 - src/objviewer/CMakeLists.txt | 1 - src/perf/CMakeLists.txt | 1 - src/redbook/CMakeLists.txt | 1 - src/samples/CMakeLists.txt | 1 - src/slang/CMakeLists.txt | 1 - src/tests/CMakeLists.txt | 1 - src/trivial/CMakeLists.txt | 1 - src/util/CMakeLists.txt | 1 - src/vp/CMakeLists.txt | 1 - src/vpglsl/CMakeLists.txt | 1 - src/wgl/CMakeLists.txt | 1 - 17 files changed, 0 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 48f218f..dbb3359 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,20 +16,6 @@ find_path (GLEW_INCLUDE_DIR GL/glew.h /usr/include/GL ) -if (APPLE) - find_path(GLEXT_INCLUDE_DIR - NAMES OpenGL/glext.h - PATHS ${OPENGL_INCLUDE_DIR} - DOC "Include for OpenGL/glext.h on OSX" - ) -else (APPLE) - find_path(GLEXT_INCLUDE_DIR - NAMES GL/glext.h - PATHS ${OPENGL_INCLUDE_DIR} - DOC "Include for GL/glext.h" - ) -endif (APPLE) - if (UNIX) link_libraries(m) endif (UNIX) diff --git a/src/demos/CMakeLists.txt b/src/demos/CMakeLists.txt index e6eadc9..f1bcc03 100644 --- a/src/demos/CMakeLists.txt +++ b/src/demos/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories ( ${CMAKE_SOURCE_DIR}/src/util - ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} diff --git a/src/fp/CMakeLists.txt b/src/fp/CMakeLists.txt index 0ce0f27..a8aaad2 100644 --- a/src/fp/CMakeLists.txt +++ b/src/fp/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories ( ${CMAKE_SOURCE_DIR}/src/util - ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} diff --git a/src/fpglsl/CMakeLists.txt b/src/fpglsl/CMakeLists.txt index 6ad0f7b..deb335b 100644 --- a/src/fpglsl/CMakeLists.txt +++ b/src/fpglsl/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories ( ${CMAKE_SOURCE_DIR}/src/util - ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} diff --git a/src/glsl/CMakeLists.txt b/src/glsl/CMakeLists.txt index fb6ca1f..11f8e37 100644 --- a/src/glsl/CMakeLists.txt +++ b/src/glsl/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories ( ${CMAKE_SOURCE_DIR}/src/util - ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} diff --git a/src/gs/CMakeLists.txt b/src/gs/CMakeLists.txt index 1354017..eef685d 100644 --- a/src/gs/CMakeLists.txt +++ b/src/gs/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories ( ${CMAKE_SOURCE_DIR}/src/util - ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} diff --git a/src/objviewer/CMakeLists.txt b/src/objviewer/CMakeLists.txt index fd78840..fc61720 100644 --- a/src/objviewer/CMakeLists.txt +++ b/src/objviewer/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories ( ${CMAKE_SOURCE_DIR}/src/util - ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} diff --git a/src/perf/CMakeLists.txt b/src/perf/CMakeLists.txt index ef24ee5..68b6875 100644 --- a/src/perf/CMakeLists.txt +++ b/src/perf/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories ( ${CMAKE_SOURCE_DIR}/src/util - ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} diff --git a/src/redbook/CMakeLists.txt b/src/redbook/CMakeLists.txt index 1210150..37201af 100644 --- a/src/redbook/CMakeLists.txt +++ b/src/redbook/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories ( ${CMAKE_SOURCE_DIR}/src/util - ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} diff --git a/src/samples/CMakeLists.txt b/src/samples/CMakeLists.txt index 978f769..b83ee91 100644 --- a/src/samples/CMakeLists.txt +++ b/src/samples/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories ( ${CMAKE_SOURCE_DIR}/src/util - ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} diff --git a/src/slang/CMakeLists.txt b/src/slang/CMakeLists.txt index e5d17fd..8e5c7e1 100644 --- a/src/slang/CMakeLists.txt +++ b/src/slang/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories ( ${CMAKE_SOURCE_DIR}/src/util - ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 589bda1..c65505b 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories ( ${CMAKE_SOURCE_DIR}/src/util - ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} diff --git a/src/trivial/CMakeLists.txt b/src/trivial/CMakeLists.txt index 0bb40b7..26598a0 100644 --- a/src/trivial/CMakeLists.txt +++ b/src/trivial/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories ( ${CMAKE_SOURCE_DIR}/src/util - ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index 2018428..a3ea7b4 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/util - ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} diff --git a/src/vp/CMakeLists.txt b/src/vp/CMakeLists.txt index 1395b57..5bc4911 100644 --- a/src/vp/CMakeLists.txt +++ b/src/vp/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories ( ${CMAKE_SOURCE_DIR}/src/util - ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} diff --git a/src/vpglsl/CMakeLists.txt b/src/vpglsl/CMakeLists.txt index 7e29b20..36ee986 100644 --- a/src/vpglsl/CMakeLists.txt +++ b/src/vpglsl/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories ( ${CMAKE_SOURCE_DIR}/src/util - ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} diff --git a/src/wgl/CMakeLists.txt b/src/wgl/CMakeLists.txt index 950e352..834e836 100644 --- a/src/wgl/CMakeLists.txt +++ b/src/wgl/CMakeLists.txt @@ -1,5 +1,4 @@ include_directories ( - ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} ${GLEW_INCLUDE_DIR} ) _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
