summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2011-08-02 21:33:18 +0100
committerJosé Fonseca <jfonseca@vmware.com>2011-08-02 21:33:18 +0100
commit4740962280d8906334e7e2b3096315cd3fbe1b16 (patch)
treecea1babbef7ab7ac9ef6f5b77c3dd3fa14f99ae5
parent5722220627c494403eb5e944c48a491d212b3c5a (diff)
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.
-rw-r--r--CMakeLists.txt14
-rw-r--r--src/demos/CMakeLists.txt1
-rw-r--r--src/fp/CMakeLists.txt1
-rw-r--r--src/fpglsl/CMakeLists.txt1
-rw-r--r--src/glsl/CMakeLists.txt1
-rw-r--r--src/gs/CMakeLists.txt1
-rw-r--r--src/objviewer/CMakeLists.txt1
-rw-r--r--src/perf/CMakeLists.txt1
-rw-r--r--src/redbook/CMakeLists.txt1
-rw-r--r--src/samples/CMakeLists.txt1
-rw-r--r--src/slang/CMakeLists.txt1
-rw-r--r--src/tests/CMakeLists.txt1
-rw-r--r--src/trivial/CMakeLists.txt1
-rw-r--r--src/util/CMakeLists.txt1
-rw-r--r--src/vp/CMakeLists.txt1
-rw-r--r--src/vpglsl/CMakeLists.txt1
-rw-r--r--src/wgl/CMakeLists.txt1
17 files changed, 0 insertions, 30 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48f218f9..dbb33592 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 e6eadc98..f1bcc03f 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 0ce0f277..a8aaad20 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 6ad0f7bd..deb335bb 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 fb6ca1f8..11f8e374 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 1354017c..eef685d0 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 fd788407..fc617200 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 ef24ee59..68b6875d 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 1210150a..37201af4 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 978f769b..b83ee916 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 e5d17fd6..8e5c7e10 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 589bda15..c65505b7 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 0bb40b7e..26598a06 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 20184280..a3ea7b49 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 1395b57f..5bc49119 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 7e29b203..36ee9862 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 950e352f..834e836b 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}
)