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.
master
John Bartholomew ago%!(EXTRA string=13 years)
parent b28298f329
commit 93ec9fa901
  1. 6
      CMakeLists.txt
  2. 1
      src/CMakeLists.txt
  3. 2
      src/libglfw3.pc.in

@ -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()

@ -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)

@ -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}
Loading…
Cancel
Save