[waffle] [PATCH] cmake: Find and set include path for wglext.h

[Emil Velikov]

Thanks for the reminder Jose.

The general consensus in #cmake (halfway though the GSoC) was that
find_package(OpenGL REQUIRED) for Windows development is (should) not be
needed, thus I've dropped it ages ago.

Either way the commit looks good imho.
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>

On 26/11/14 10:24, Jose Fonseca wrote:
> It would be nice if you could include this on waffle 1.5.0.
> 
> Without this, one is forced to download and put the Khronos wglext.h
> into the same folder MSVC/MinGW system headers are (a bad idea because
> it just masks away problem like this), or modify waffle locally.
> 
> Jose
> 
> On 23/11/14 09:32, jfonseca at vmware.com wrote:
>> From: José Fonseca <jfonseca at vmware.com>
>>
>> GL/*glext.h is not provided by the system (be it MinGW or MSVC), so its
>> path must be specified separately.
>>
>> I used GLEXT_INCLUDE_DIR, which is the name also used for Piglit, so
>> that existing CMake initial caches might already provide it.
>> ---
>>   cmake/Modules/WaffleFindDependencies.cmake | 6 ++++++
>>   src/waffle/CMakeLists.txt                  | 1 +
>>   2 files changed, 7 insertions(+)
>>
>> diff --git a/cmake/Modules/WaffleFindDependencies.cmake
>> b/cmake/Modules/WaffleFindDependencies.cmake
>> index 9245772..1c617f7 100644
>> --- a/cmake/Modules/WaffleFindDependencies.cmake
>> +++ b/cmake/Modules/WaffleFindDependencies.cmake
>> @@ -80,3 +80,9 @@ if(waffle_on_linux)
>>       waffle_pkg_config(gbm gbm)
>>       waffle_pkg_config(libudev libudev)
>>   endif()
>> +
>> +
>> +if(waffle_on_windows)
>> +    find_package(OpenGL REQUIRED)
>> +    find_path(GLEXT_INCLUDE_DIR NAMES GL/wglext.h DOC "Include for
>> GL/wglext.h")
>> +endif()
>> diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt
>> index 5c63c47..aef0952 100644
>> --- a/src/waffle/CMakeLists.txt
>> +++ b/src/waffle/CMakeLists.txt
>> @@ -23,6 +23,7 @@ include_directories(
>>       ${egl_INCLUDE_DIRS}
>>       ${gbm_INCLUDE_DIRS}
>>       ${gl_INCLUDE_DIRS}
>> +    ${GLEXT_INCLUDE_DIR}
>>       ${libudev_INCLUDE_DIRS}
>>       ${wayland-client_INCLUDE_DIRS}
>>       ${wayland-egl_INCLUDE_DIRS}
>>
>