cmake: Allow GL/glext.h to be specified separately.

glext.h is not bundled on MSVC, so its path needs to be included
separately.

It might be also useful on other platforms to override the system's
glext.h with a more recent one.

19 files changed, 34 insertions, 0 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af6b0b1ba..3634bb45e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,6 +18,20 @@ IF (C_COMPILER_FLAG_WALL)
 	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 ENDIF (C_COMPILER_FLAG_WALL)
 
+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)
+
 FIND_LIBRARY(OPENGL_egl_LIBRARY
       NAMES EGL
       PATHS /usr/lib
diff --git a/tests/asmparsertest/CMakeLists.gl.txt b/tests/asmparsertest/CMakeLists.gl.txt
index c132861df..d8c0007fe 100644
--- a/tests/asmparsertest/CMakeLists.gl.txt
+++ b/tests/asmparsertest/CMakeLists.gl.txt
@@ -1,5 +1,6 @@
 
 include_directories(
+	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/util
diff --git a/tests/bugs/CMakeLists.gl.txt b/tests/bugs/CMakeLists.gl.txt
index fde52c1fd..077abe9e8 100644
--- a/tests/bugs/CMakeLists.gl.txt
+++ b/tests/bugs/CMakeLists.gl.txt
@@ -1,5 +1,6 @@
 
 include_directories(
+	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
diff --git a/tests/egl/CMakeLists.gl.txt b/tests/egl/CMakeLists.gl.txt
index d967b854b..35ee3263c 100644
--- a/tests/egl/CMakeLists.gl.txt
+++ b/tests/egl/CMakeLists.gl.txt
@@ -1,5 +1,6 @@
 
 include_directories(
+	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/util
diff --git a/tests/fbo/CMakeLists.gl.txt b/tests/fbo/CMakeLists.gl.txt
index ab520b640..2de41f3d0 100644
--- a/tests/fbo/CMakeLists.gl.txt
+++ b/tests/fbo/CMakeLists.gl.txt
@@ -1,5 +1,6 @@
 
 include_directories(
+	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
diff --git a/tests/general/CMakeLists.gl.txt b/tests/general/CMakeLists.gl.txt
index 316b31e10..63b00e131 100644
--- a/tests/general/CMakeLists.gl.txt
+++ b/tests/general/CMakeLists.gl.txt
@@ -1,5 +1,6 @@
 
 include_directories(
+	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/util
diff --git a/tests/glean/CMakeLists.gl.txt b/tests/glean/CMakeLists.gl.txt
index 749b4b0b1..4bc53fa83 100644
--- a/tests/glean/CMakeLists.gl.txt
+++ b/tests/glean/CMakeLists.gl.txt
@@ -10,6 +10,7 @@ ELSE ()
 ENDIF ()
 
 include_directories(
+	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${TIFF_INCLUDE_DIR}
 )
diff --git a/tests/glslparsertest/CMakeLists.gl.txt b/tests/glslparsertest/CMakeLists.gl.txt
index 704b4ecee..bb58eeb34 100644
--- a/tests/glslparsertest/CMakeLists.gl.txt
+++ b/tests/glslparsertest/CMakeLists.gl.txt
@@ -1,4 +1,6 @@
 include_directories(
+	${GLEXT_INCLUDE_DIR}
+	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	)
 
diff --git a/tests/glx/CMakeLists.gl.txt b/tests/glx/CMakeLists.gl.txt
index 5bb76eb25..b3b590bb5 100644
--- a/tests/glx/CMakeLists.gl.txt
+++ b/tests/glx/CMakeLists.gl.txt
@@ -1,5 +1,6 @@
 
 include_directories(
+	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/util
diff --git a/tests/mesa/tests/CMakeLists.gl.txt b/tests/mesa/tests/CMakeLists.gl.txt
index 039521717..9cee8bb37 100644
--- a/tests/mesa/tests/CMakeLists.gl.txt
+++ b/tests/mesa/tests/CMakeLists.gl.txt
@@ -1,4 +1,5 @@
 include_directories(
+	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${PNG_INCLUDE_DIR}
diff --git a/tests/mesa/util/CMakeLists.gl.txt b/tests/mesa/util/CMakeLists.gl.txt
index 1635cacd7..29108600c 100644
--- a/tests/mesa/util/CMakeLists.gl.txt
+++ b/tests/mesa/util/CMakeLists.gl.txt
@@ -1,5 +1,6 @@
 
 include_directories (
+	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${PNG_INCLUDE_DIR}
diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
index 5de35d112..e12a00eb8 100644
--- a/tests/shaders/CMakeLists.gl.txt
+++ b/tests/shaders/CMakeLists.gl.txt
@@ -1,5 +1,6 @@
 
 include_directories(
+	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
diff --git a/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt b/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
index 829b610fc..868334cbf 100644
--- a/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
+++ b/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
@@ -1,4 +1,5 @@
 include_directories(
+	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
diff --git a/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt b/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
index 7d047f72e..cd0390ae9 100644
--- a/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
+++ b/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
@@ -1,5 +1,6 @@
 
 include_directories(
+	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
diff --git a/tests/spec/arb_shader_texture_lod/CMakeLists.gl.txt b/tests/spec/arb_shader_texture_lod/CMakeLists.gl.txt
index e0cb29668..5924d20ba 100644
--- a/tests/spec/arb_shader_texture_lod/CMakeLists.gl.txt
+++ b/tests/spec/arb_shader_texture_lod/CMakeLists.gl.txt
@@ -1,4 +1,5 @@
 include_directories(
+	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/util
diff --git a/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt b/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
index f2a142183..b0aea7ab5 100644
--- a/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
+++ b/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
@@ -1,4 +1,5 @@
 include_directories(
+	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
diff --git a/tests/spec/ext_fog_coord/CMakeLists.gl.txt b/tests/spec/ext_fog_coord/CMakeLists.gl.txt
index c51cf0d5f..13017ec88 100644
--- a/tests/spec/ext_fog_coord/CMakeLists.gl.txt
+++ b/tests/spec/ext_fog_coord/CMakeLists.gl.txt
@@ -1,4 +1,5 @@
 include_directories(
+	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
diff --git a/tests/texturing/CMakeLists.gl.txt b/tests/texturing/CMakeLists.gl.txt
index 8c28b1e7f..fd738a808 100644
--- a/tests/texturing/CMakeLists.gl.txt
+++ b/tests/texturing/CMakeLists.gl.txt
@@ -1,5 +1,6 @@
 
 include_directories(
+	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/util
diff --git a/tests/util/CMakeLists.gl.txt b/tests/util/CMakeLists.gl.txt
index 855eeb07e..88af8fdbd 100644
--- a/tests/util/CMakeLists.gl.txt
+++ b/tests/util/CMakeLists.gl.txt
@@ -1,4 +1,6 @@
 include_directories(
+	${GLEXT_INCLUDE_DIR}
+	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	)