Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed library output name to "glfw3", and pkg-config name to libglfw3.

Browse Source 
Since the headers are already named differently, this allows
side-by-side installation of GLFW 2.x and GLFW 3.x.
This commit is contained in:
John Bartholomew 2012-07-30 00:14:09 +01:00
parent b28298f329
commit 93ec9fa901
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -251,10 +251,10 @@ install(FILES COPYING.txt readme.html
# Create and install pkg-config file on supported platforms # Create and install pkg-config file on supported platforms
#-------------------------------------------------------------------- #--------------------------------------------------------------------
if (_GLFW_X11_GLX OR _GLFW_COCOA_NSGL) if (_GLFW_X11_GLX OR _GLFW_COCOA_NSGL)
configure_file(${GLFW_SOURCE_DIR}/src/libglfw.pc.in configure_file(${GLFW_SOURCE_DIR}/src/libglfw3.pc.in
${GLFW_BINARY_DIR}/src/libglfw.pc @ONLY) ${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) DESTINATION lib/pkgconfig)
endif() endif()

1
src/CMakeLists.txt
View File

@ -30,6 +30,7 @@ elseif (_GLFW_X11_GLX)
endif() endif()
add_library(glfw ${glfw_SOURCES} ${glfw_HEADERS}) add_library(glfw ${glfw_SOURCES} ${glfw_HEADERS})
set_target_properties(glfw PROPERTIES OUTPUT_NAME "glfw3")
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)

2
src/libglfw.pc.in → src/libglfw3.pc.in
View File

@ -8,6 +8,6 @@ Description: A portable library for OpenGL, window and input
Version: @GLFW_VERSION_FULL@ Version: @GLFW_VERSION_FULL@
URL: http://www.glfw.org/ URL: http://www.glfw.org/
Requires.private: @GLFW_PKG_DEPS@ Requires.private: @GLFW_PKG_DEPS@
Libs: -L${libdir} -lglfw Libs: -L${libdir} -lglfw3
Libs.private: @GLFW_PKG_LIBS@ Libs.private: @GLFW_PKG_LIBS@
Cflags: -I${includedir} Cflags: -I${includedir}