cmake: Allow to specify glext headers include path.

In order to pick different (i.e., newer) headers than the system ones.

17 files changed, 30 insertions, 0 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbb33592..48f218f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,20 @@ 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 f1bcc03f..e6eadc98 100644
--- a/src/demos/CMakeLists.txt
+++ b/src/demos/CMakeLists.txt
@@ -1,5 +1,6 @@
 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 a8aaad20..0ce0f277 100644
--- a/src/fp/CMakeLists.txt
+++ b/src/fp/CMakeLists.txt
@@ -1,5 +1,6 @@
 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 deb335bb..6ad0f7bd 100644
--- a/src/fpglsl/CMakeLists.txt
+++ b/src/fpglsl/CMakeLists.txt
@@ -1,5 +1,6 @@
 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 11f8e374..fb6ca1f8 100644
--- a/src/glsl/CMakeLists.txt
+++ b/src/glsl/CMakeLists.txt
@@ -1,5 +1,6 @@
 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 eef685d0..1354017c 100644
--- a/src/gs/CMakeLists.txt
+++ b/src/gs/CMakeLists.txt
@@ -1,5 +1,6 @@
 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 fc617200..fd788407 100644
--- a/src/objviewer/CMakeLists.txt
+++ b/src/objviewer/CMakeLists.txt
@@ -1,5 +1,6 @@
 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 68b6875d..ef24ee59 100644
--- a/src/perf/CMakeLists.txt
+++ b/src/perf/CMakeLists.txt
@@ -1,5 +1,6 @@
 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 37201af4..1210150a 100644
--- a/src/redbook/CMakeLists.txt
+++ b/src/redbook/CMakeLists.txt
@@ -1,5 +1,6 @@
 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 b83ee916..978f769b 100644
--- a/src/samples/CMakeLists.txt
+++ b/src/samples/CMakeLists.txt
@@ -1,5 +1,6 @@
 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 8e5c7e10..e5d17fd6 100644
--- a/src/slang/CMakeLists.txt
+++ b/src/slang/CMakeLists.txt
@@ -1,5 +1,6 @@
 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 c65505b7..589bda15 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -1,5 +1,6 @@
 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 26598a06..0bb40b7e 100644
--- a/src/trivial/CMakeLists.txt
+++ b/src/trivial/CMakeLists.txt
@@ -1,5 +1,6 @@
 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 a3ea7b49..20184280 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -1,5 +1,6 @@
 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 5bc49119..1395b57f 100644
--- a/src/vp/CMakeLists.txt
+++ b/src/vp/CMakeLists.txt
@@ -1,5 +1,6 @@
 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 36ee9862..7e29b203 100644
--- a/src/vpglsl/CMakeLists.txt
+++ b/src/vpglsl/CMakeLists.txt
@@ -1,5 +1,6 @@
 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 834e836b..950e352f 100644
--- a/src/wgl/CMakeLists.txt
+++ b/src/wgl/CMakeLists.txt
@@ -1,4 +1,5 @@
 include_directories (
+	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLEW_INCLUDE_DIR}
 )