From 0043169f0f8b4a0444ce042087813bf59bacae89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 6 Jan 2018 19:47:24 +0100 Subject: [PATCH] modules: FindGLFW.cmake should prefer absolute includes. It's not like with SDL where we can't use due to macOS packaged shipped without the SDL2 include directory. This was just a bad copypaste from the FindSDL2.cmake module, probably. --- modules/FindGLFW.cmake | 3 +-- src/Magnum/Platform/GlfwApplication.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/FindGLFW.cmake b/modules/FindGLFW.cmake index 099b61383..e831fdb2b 100644 --- a/modules/FindGLFW.cmake +++ b/modules/FindGLFW.cmake @@ -43,8 +43,7 @@ find_library(GLFW_LIBRARY NAMES glfw glfw3) # Include dir find_path(GLFW_INCLUDE_DIR - NAMES glfw3.h - PATH_SUFFIXES GLFW) + NAMES GLFW/glfw3.h) include(FindPackageHandleStandardArgs) find_package_handle_standard_args("GLFW" DEFAULT_MSG diff --git a/src/Magnum/Platform/GlfwApplication.h b/src/Magnum/Platform/GlfwApplication.h index 84cb5f15f..712efda2a 100644 --- a/src/Magnum/Platform/GlfwApplication.h +++ b/src/Magnum/Platform/GlfwApplication.h @@ -42,7 +42,7 @@ /* We must include our own GL headers first to avoid conflicts */ #include "Magnum/OpenGL.h" -#include +#include namespace Magnum { namespace Platform {