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

Fixed listing of non-pkg-config libraries.

Browse Source
This commit is contained in:
Camilla Berglund 2012-03-25 17:31:22 +02:00
parent 8dc1391835
commit c097246312
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -63,7 +63,8 @@ if (_GLFW_X11_GLX)
list(APPEND glfw_INCLUDE_DIRS ${X11_X11_INCLUDE_PATH} ${OPENGL_INCLUDE_DIR}) list(APPEND glfw_INCLUDE_DIRS ${X11_X11_INCLUDE_PATH} ${OPENGL_INCLUDE_DIR})
list(APPEND glfw_LIBRARIES ${X11_X11_LIB} ${OPENGL_gl_LIBRARY}) list(APPEND glfw_LIBRARIES ${X11_X11_LIB} ${OPENGL_gl_LIBRARY})
set(GLFW_PKGLIBS "gl x11") set(GLFW_PKG_DEPS "gl x11")
set(GLFW_PKG_LIBS "")
include(CheckFunctionExists) include(CheckFunctionExists)
@ -72,7 +73,7 @@ if (_GLFW_X11_GLX)
set(_GLFW_HAS_XRANDR 1) set(_GLFW_HAS_XRANDR 1)
list(APPEND glfw_INCLUDE_DIRS ${X11_Xrandr_INCLUDE_PATH}) list(APPEND glfw_INCLUDE_DIRS ${X11_Xrandr_INCLUDE_PATH})
list(APPEND glfw_LIBRARIES ${X11_Xrandr_LIB}) list(APPEND glfw_LIBRARIES ${X11_Xrandr_LIB})
set(GLFW_PKGLIBS "${GLFW_PKGLIBS} xrandr") set(GLFW_PKG_DEPS "${GLFW_PKG_DEPS} xrandr")
endif() endif()
# Check for Xf86VidMode (fallback legacy resolution switching extension) # Check for Xf86VidMode (fallback legacy resolution switching extension)
@ -88,7 +89,7 @@ if (_GLFW_X11_GLX)
list(APPEND glfw_LIBRARIES Xxf86vm) list(APPEND glfw_LIBRARIES Xxf86vm)
endif() endif()
set(GLFW_PKGLIBS "${GLFW_PKGLIBS} xxf86vm") set(GLFW_PKG_DEPS "${GLFW_PKG_DEPS} xxf86vm")
endif() endif()
# Check for Xkb (X keyboard extension) # Check for Xkb (X keyboard extension)
@ -101,14 +102,14 @@ if (_GLFW_X11_GLX)
mark_as_advanced(RT_LIBRARY) mark_as_advanced(RT_LIBRARY)
if (RT_LIBRARY) if (RT_LIBRARY)
list(APPEND glfw_LIBRARIES ${RT_LIBRARY}) list(APPEND glfw_LIBRARIES ${RT_LIBRARY})
set(GLFW_PKGLIBS "${GLFW_PKGLIBS} rt") set(GLFW_PKG_LIBS "${GLFW_PKG_LIBS} -lrt")
endif() endif()
find_library(MATH_LIBRARY m) find_library(MATH_LIBRARY m)
mark_as_advanced(MATH_LIBRARY) mark_as_advanced(MATH_LIBRARY)
if (MATH_LIBRARY) if (MATH_LIBRARY)
list(APPEND glfw_LIBRARIES ${MATH_LIBRARY}) list(APPEND glfw_LIBRARIES ${MATH_LIBRARY})
set(GLFW_PKGLIBS "${GLFW_PKGLIBS} m") set(GLFW_PKG_LIBS "${GLFW_PKG_LIBS} -lm")
endif() endif()
set(CMAKE_REQUIRED_LIBRARIES ${OPENGL_gl_LIBRARY}) set(CMAKE_REQUIRED_LIBRARIES ${OPENGL_gl_LIBRARY})
@ -146,7 +147,7 @@ if (_GLFW_X11_GLX)
if (DL_LIBRARY) if (DL_LIBRARY)
list(APPEND glfw_LIBRARIES ${DL_LIBRARY}) list(APPEND glfw_LIBRARIES ${DL_LIBRARY})
set(GLFW_PKGLIBS "${GLFW_PKGLIBS} dl") set(GLFW_PKG_LIBS "${GLFW_PKG_LIBS} -ldl")
endif() endif()
endif() endif()

3
src/libglfw.pc.cmake
View File

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