From 965b7ddc72f89ff11e7c4740126ff3ca8ce3be8e Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 2 Feb 2009 20:34:58 +0000 Subject: [PATCH] Attempt to appease both FreeBSD CMAke 2.6.2 + Linux CMake 2.4.8 builds --- src/osgViewer/CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/osgViewer/CMakeLists.txt b/src/osgViewer/CMakeLists.txt index 6347eb79a..11afe0676 100644 --- a/src/osgViewer/CMakeLists.txt +++ b/src/osgViewer/CMakeLists.txt @@ -115,10 +115,16 @@ ELSE(WIN32) ) IF(OSGVIEWER_USE_XRANDR) + ADD_DEFINITIONS(-DOSGVIEWER_USE_XRANDR) SET(LIB_PRIVATE_HEADERS ${LIB_PRIVATE_HEADERS} ${XRANDR_INCLUDE_DIRS} ) -# SET(LIB_EXTRA_LIBS ${X11_Xrandr_LIB} ${LIB_EXTRA_LIBS}) - SET(LIB_EXTRA_LIBS ${XRANDR_LIBRARIES} ${LIB_EXTRA_LIBS}) + + IF (X11_Xrandr_LIB) + SET(LIB_EXTRA_LIBS ${X11_Xrandr_LIB} ${LIB_EXTRA_LIBS}) + ELSE(X11_Xrandr_LIB) + SET(LIB_EXTRA_LIBS ${XRANDR_LIBRARIES} ${LIB_EXTRA_LIBS}) + ENDIF(X11_Xrandr_LIB) + ENDIF(OSGVIEWER_USE_XRANDR) # X11 on Apple requires X11 library plus OpenGL linking hack on Leopard