Merge branch 'master' into clipboard

This commit is contained in:
Camilla Berglund
2012-03-28 14:58:03 +02:00
12 changed files with 163 additions and 20 deletions
-7
View File
@@ -1,11 +1,4 @@
if (_GLFW_X11_GLX)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake
${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc
DESTINATION lib/pkgconfig)
endif()
include_directories(${GLFW_SOURCE_DIR}/src
${GLFW_BINARY_DIR}/src
${glfw_INCLUDE_DIRS})