X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=CMakeLists.txt;h=29dd51588090e0c0fcb4e583bc97deeaba85b657;hb=2f4f40f5c161bda0460145dc79c39082890023a3;hp=95eee545179a4b3d48b1603de854cf0faf2205dc;hpb=d54280cbf8b61c32dec35d8b9858bda78e17495c;p=freeglut

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95eee54..29dd515 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,7 +102,11 @@ if(UNIX)
 	ENDIF()
 	IF(X11_xf86vmode_FOUND)
 		SET(HAVE_X11_EXTENSIONS_XF86VMODE_H TRUE)
-		LIST(APPEND LIBS ${X11_xf86vmode_LIB})
+		# Work-around http://www.cmake.org/Bug/bug_view_page.php?bug_id=6976
+		IF(NOT "${X11_Xxf86vm_LIB}")
+			SET(X11_Xxf86vm_LIB "Xxf86vm")
+		ENDIF()
+		LIST(APPEND LIBS ${X11_Xxf86vm_LIB})
 	ENDIF()
 ENDIF()
 
@@ -169,6 +173,8 @@ INSTALL(FILES ${FREEGLUT_HEADERS} DESTINATION include/GL)
 option( FREEGLUT_BUILD_DEMOS "Build FreeGLUT demos." ON )
 
 SET(DEMO_LIBS ${OPENGL_LIBRARY} ${LIBS})
+LIST(APPEND DEMO_LIBS m)
+
 MACRO(ADD_DEMO name)
 	if( FREEGLUT_BUILD_DEMOS )
 		ADD_EXECUTABLE(${name} ${ARGN})