AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-09-19 22:30:05 +00:00
Code Issues Releases Wiki Activity

fix GLFW Xrandr & xf86vmode dependency paths for X11 based systems

Browse Source 
now uses the path returned by FindX11.cmake instead of just a -l<xxx>

fixes #199
This commit is contained in:
manuelk 2013-07-30 10:30:55 -07:00
parent 94fc47a9db
commit 03990c3101
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/FindGLFW.cmake
View File

@ -111,9 +111,15 @@ else ()
find_package(X11 REQUIRED)
if(NOT X11_Xrandr_FOUND)
message(FATAL_ERROR "Xrandr library not found")
message(FATAL_ERROR "Xrandr library not found - required for GLFW")
endif()
if(NOT X11_xf86vmode_FOUND)
message(FATAL_ERROR "xf86vmode library not found - required for GLFW")
endif()
list(APPEND GLFW_x11_LIBRARY ${X11_Xrandr_LIB} ${X11_Xxf86vm_LIB})
find_library( GLFW_glfw_LIBRARY
NAMES
glfw
@ -138,7 +144,7 @@ set( GLFW_FOUND "NO" )
if(GLFW_INCLUDE_DIR)
if(GLFW_glfw_LIBRARY)
set( GLFW_LIBRARIES ${GLFW_glfw_LIBRARY} ${GLFW_cocoa_LIBRARY} ${GLFW_iokit_LIBRARY} )
set( GLFW_LIBRARIES ${GLFW_glfw_LIBRARY} ${GLFW_x11_LIBRARY} ${GLFW_cocoa_LIBRARY} ${GLFW_iokit_LIBRARY} )
set( GLFW_FOUND "YES" )
set (GLFW_LIBRARY ${GLFW_LIBRARIES})
set (GLFW_INCLUDE_PATH ${GLFW_INCLUDE_DIR})
@ -179,10 +185,6 @@ if(GLFW_INCLUDE_DIR)
mark_as_advanced(GLFW_VERSION)
endif()
# static builds of glfw require Xrandr
if( NOT WIN32 AND NOT APPLE AND GLFW_FOUND)
list(APPEND GLFW_LIBRARIES -lXrandr -lXxf86vm)
endif()
endif(GLFW_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)