From 93ec9fa90171ce7bdcd52ea0dc7ade981ed1d113 Mon Sep 17 00:00:00 2001
From: John Bartholomew <jpa.bartholomew@gmail.com>
Date: Mon, 30 Jul 2012 00:14:09 +0100
Subject: [PATCH 1/2] Changed library output name to "glfw3", and pkg-config
 name to libglfw3.

Since the headers are already named differently, this allows
side-by-side installation of GLFW 2.x and GLFW 3.x.
---
 CMakeLists.txt                        | 6 +++---
 src/CMakeLists.txt                    | 1 +
 src/{libglfw.pc.in => libglfw3.pc.in} | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename src/{libglfw.pc.in => libglfw3.pc.in} (92%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7fbdd950..f082c3d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -251,10 +251,10 @@ install(FILES COPYING.txt readme.html
 # Create and install pkg-config file on supported platforms
 #--------------------------------------------------------------------
 if (_GLFW_X11_GLX OR _GLFW_COCOA_NSGL)
-    configure_file(${GLFW_SOURCE_DIR}/src/libglfw.pc.in 
-                   ${GLFW_BINARY_DIR}/src/libglfw.pc @ONLY)
+    configure_file(${GLFW_SOURCE_DIR}/src/libglfw3.pc.in
+                   ${GLFW_BINARY_DIR}/src/libglfw3.pc @ONLY)
 
-    install(FILES ${GLFW_BINARY_DIR}/src/libglfw.pc
+    install(FILES ${GLFW_BINARY_DIR}/src/libglfw3.pc
             DESTINATION lib/pkgconfig)
 endif()
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 25a80e3a..78cd1c07 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,6 +30,7 @@ elseif (_GLFW_X11_GLX)
 endif()
 
 add_library(glfw ${glfw_SOURCES} ${glfw_HEADERS})
+set_target_properties(glfw PROPERTIES OUTPUT_NAME "glfw3")
 
 if (BUILD_SHARED_LIBS)
 
diff --git a/src/libglfw.pc.in b/src/libglfw3.pc.in
similarity index 92%
rename from src/libglfw.pc.in
rename to src/libglfw3.pc.in
index be6275aa..775819ed 100644
--- a/src/libglfw.pc.in
+++ b/src/libglfw3.pc.in
@@ -8,6 +8,6 @@ Description: A portable library for OpenGL, window and input
 Version: @GLFW_VERSION_FULL@
 URL: http://www.glfw.org/
 Requires.private: @GLFW_PKG_DEPS@
-Libs: -L${libdir} -lglfw
+Libs: -L${libdir} -lglfw3
 Libs.private: @GLFW_PKG_LIBS@
 Cflags: -I${includedir}

From 0f0e42b975742c0918e0813b7a24247c197ed758 Mon Sep 17 00:00:00 2001
From: John Bartholomew <jpa.bartholomew@gmail.com>
Date: Mon, 30 Jul 2012 01:04:08 +0100
Subject: [PATCH 2/2] Use SOVERSION for shared libraries on Unix-like systems.

---
 CMakeLists.txt     | 10 ++++++++++
 src/CMakeLists.txt |  7 ++++++-
 src/libglfw3.pc.in |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f082c3d7..d49a2aea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,6 +215,16 @@ endif()
 #--------------------------------------------------------------------
 set(GLFW_LIBRARIES ${glfw_LIBRARIES} CACHE STRING "Dependencies of GLFW")
 
+#--------------------------------------------------------------------
+# Choose library output name
+#--------------------------------------------------------------------
+if (BUILD_SHARED_LIBS AND UNIX)
+    # On Unix-like systems, shared libraries can use the soname system.
+    set(GLFW_LIB_NAME glfw)
+else()
+    set(GLFW_LIB_NAME glfw3)
+endif()
+
 #--------------------------------------------------------------------
 # Add subdirectories
 #--------------------------------------------------------------------
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 78cd1c07..926ef668 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,9 +30,14 @@ elseif (_GLFW_X11_GLX)
 endif()
 
 add_library(glfw ${glfw_SOURCES} ${glfw_HEADERS})
-set_target_properties(glfw PROPERTIES OUTPUT_NAME "glfw3")
+set_target_properties(glfw PROPERTIES OUTPUT_NAME "${GLFW_LIB_NAME}")
 
 if (BUILD_SHARED_LIBS)
+    # Include version information in the output
+    set_target_properties(glfw PROPERTIES VERSION ${GLFW_VERSION})
+    if (UNIX)
+        set_target_properties(glfw PROPERTIES SOVERSION ${GLFW_VERSION_MAJOR})
+    endif()
 
     if (_GLFW_WIN32_WGL)
         # The GLFW DLL needs a special compile-time macro and import library name
diff --git a/src/libglfw3.pc.in b/src/libglfw3.pc.in
index 775819ed..175c902d 100644
--- a/src/libglfw3.pc.in
+++ b/src/libglfw3.pc.in
@@ -8,6 +8,6 @@ Description: A portable library for OpenGL, window and input
 Version: @GLFW_VERSION_FULL@
 URL: http://www.glfw.org/
 Requires.private: @GLFW_PKG_DEPS@
-Libs: -L${libdir} -lglfw3
+Libs: -L${libdir} -l@GLFW_LIB_NAME@
 Libs.private: @GLFW_PKG_LIBS@
 Cflags: -I${includedir}