From 7f6d952dbee32abb1304372dc9bc3fc31ec1b0b2 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Mon, 19 Nov 2012 12:05:29 +0000 Subject: [PATCH] A better fix than 17a2a8e3d1f8bd8e841443ec5157ee71010ba965 for GLEW --- examples/Basic/CMakeLists.txt | 2 +- examples/Basic/glew/glxew.h | 2 +- examples/OpenGL/CMakeLists.txt | 2 +- examples/OpenGL/glew/glxew.h | 2 +- examples/Paging/CMakeLists.txt | 2 +- examples/Paging/glew/glxew.h | 2 +- examples/SmoothLOD/CMakeLists.txt | 2 +- examples/SmoothLOD/glew/glxew.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/Basic/CMakeLists.txt b/examples/Basic/CMakeLists.txt index dbb4e9aa..a17c1eeb 100644 --- a/examples/Basic/CMakeLists.txt +++ b/examples/Basic/CMakeLists.txt @@ -50,7 +50,7 @@ SOURCE_GROUP("Headers" FILES ${INC_FILES}) FIND_PACKAGE(OpenGL REQUIRED) #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location) -INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxCore_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxCore_SOURCE_DIR}/include) LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}) #Build diff --git a/examples/Basic/glew/glxew.h b/examples/Basic/glew/glxew.h index dc467d33..5cb2d222 100644 --- a/examples/Basic/glew/glxew.h +++ b/examples/Basic/glew/glxew.h @@ -97,7 +97,7 @@ #include #include #include -#include +#include "glew.h" #ifdef __cplusplus extern "C" { diff --git a/examples/OpenGL/CMakeLists.txt b/examples/OpenGL/CMakeLists.txt index fb32fd12..5b61f759 100644 --- a/examples/OpenGL/CMakeLists.txt +++ b/examples/OpenGL/CMakeLists.txt @@ -56,7 +56,7 @@ SOURCE_GROUP("Headers" FILES ${INC_FILES}) FIND_PACKAGE(OpenGL REQUIRED) #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location) -INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxCore_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxCore_SOURCE_DIR}/include) LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}) #Build diff --git a/examples/OpenGL/glew/glxew.h b/examples/OpenGL/glew/glxew.h index dc467d33..5cb2d222 100644 --- a/examples/OpenGL/glew/glxew.h +++ b/examples/OpenGL/glew/glxew.h @@ -97,7 +97,7 @@ #include #include #include -#include +#include "glew.h" #ifdef __cplusplus extern "C" { diff --git a/examples/Paging/CMakeLists.txt b/examples/Paging/CMakeLists.txt index fb30c611..88fb5b6f 100644 --- a/examples/Paging/CMakeLists.txt +++ b/examples/Paging/CMakeLists.txt @@ -52,7 +52,7 @@ SOURCE_GROUP("Headers" FILES ${INC_FILES}) FIND_PACKAGE(OpenGL REQUIRED) #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location) -INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxCore_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxCore_SOURCE_DIR}/include) LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}) #Build diff --git a/examples/Paging/glew/glxew.h b/examples/Paging/glew/glxew.h index dc467d33..5cb2d222 100644 --- a/examples/Paging/glew/glxew.h +++ b/examples/Paging/glew/glxew.h @@ -97,7 +97,7 @@ #include #include #include -#include +#include "glew.h" #ifdef __cplusplus extern "C" { diff --git a/examples/SmoothLOD/CMakeLists.txt b/examples/SmoothLOD/CMakeLists.txt index 2cf2644f..86923a0a 100644 --- a/examples/SmoothLOD/CMakeLists.txt +++ b/examples/SmoothLOD/CMakeLists.txt @@ -50,7 +50,7 @@ SOURCE_GROUP("Headers" FILES ${INC_FILES}) FIND_PACKAGE(OpenGL REQUIRED) #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location) -INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxCore_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxCore_SOURCE_DIR}/include) LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}) #Build diff --git a/examples/SmoothLOD/glew/glxew.h b/examples/SmoothLOD/glew/glxew.h index dc467d33..5cb2d222 100644 --- a/examples/SmoothLOD/glew/glxew.h +++ b/examples/SmoothLOD/glew/glxew.h @@ -97,7 +97,7 @@ #include #include #include -#include +#include "glew.h" #ifdef __cplusplus extern "C" {