From 93ec9fa90171ce7bdcd52ea0dc7ade981ed1d113 Mon Sep 17 00:00:00 2001 From: John Bartholomew Date: Mon, 30 Jul 2012 00:14:09 +0100 Subject: [PATCH] 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}