From 966076eca85c16398dd94bd0463cf1b1b3176b94 Mon Sep 17 00:00:00 2001
From: Camilla Berglund
Date: Fri, 27 Jan 2012 23:17:20 +0100
Subject: [PATCH] Added libm dependency for X11/GLX.
---
CMakeLists.txt | 5 +++++
readme.html | 1 +
2 files changed, 6 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fad2f423..5ad266f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,11 @@ if (UNIX AND NOT APPLE)
list(APPEND GLFW_INCLUDE_DIR ${OPENGL_INCLUDE_DIR})
list(APPEND GLFW_LIBRARIES ${OPENGL_gl_LIBRARY})
+ find_library(MATH_LIBRARY m)
+ if (MATH_LIBRARY)
+ list(APPEND GLFW_LIBRARIES ${MATH_LIBRARY})
+ endif(MATH_LIBRARY)
+
include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/CheckX11Extensions.cmake)
# Check for XRandR (modern resolution switching extension)
diff --git a/readme.html b/readme.html
index ede37bdc..8b5314d1 100644
--- a/readme.html
+++ b/readme.html
@@ -313,6 +313,7 @@ version of GLFW.
[Cocoa] Bugfix: The OpenGL framework was not retrieved, making glfwGetProcAddress crash
[X11] Added support for the GLX_EXT_swap_control
extension as an alternative to GLX_SGI_swap_control
[X11] Added the POSIX CLOCK_MONOTONIC
time source as the preferred method
+ [X11] Added dependency on libm, where present
[X11] Bugfix: Calling glXCreateContextAttribsARB
with an unavailable OpenGL version caused the application to terminate with a BadMatch
Xlib error
[X11] Bugfix: A synchronization point necessary for jitter-free locked cursor mode was incorrectly removed
[Win32] Removed explicit support for versions of Windows older than Windows XP