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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95eee54..b151e4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,8 +85,9 @@ OPTION(BUILD_SHARED_LIBS "Build FreeGLUT shared library." ON)
 OPTION(BUILD_STATIC_LIBS "Build FreeGLUT static library." ON)
 
 FIND_PACKAGE(OpenGL REQUIRED)
-
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${OPENGL_INCLUDE_DIR})
+LIST(APPEND LIBS ${OPENGL_gl_LIBRARY})
+LIST(APPEND LIBS m)
 
 IF(WIN32)
 	MESSAGE(WARNING "Insecure CRT warnings hidden (might want to fix these)")
@@ -102,7 +103,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()
 
@@ -118,6 +123,8 @@ CHECK_INCLUDE_FILES(fcntl.h 	HAVE_FCNTL_H)
 CHECK_INCLUDE_FILES(errno.h 	HAVE_ERRNO_H)
 CHECK_INCLUDE_FILES(usbhid.h 	HAVE_USBHID_H)
 CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
+CHECK_FUNCTION_EXISTS(vfprintf HAVE_VFPRINTF)
+CHECK_FUNCTION_EXISTS(_doprnt HAVE_DOPRNT)
 
 # The generated config.h is placed in the project's build directory, just to
 # ensure that all CMake-generated files are kept away from the main source tree.
@@ -168,7 +175,9 @@ INSTALL(FILES ${FREEGLUT_HEADERS} DESTINATION include/GL)
 # Optionally build demos, on by default.
 option( FREEGLUT_BUILD_DEMOS "Build FreeGLUT demos." ON )
 
-SET(DEMO_LIBS ${OPENGL_LIBRARY} ${LIBS})
+SET(DEMO_LIBS ${OPENGL_glu_LIBRARY} ${LIBS})
+LIST(APPEND DEMO_LIBS m)
+
 MACRO(ADD_DEMO name)
 	if( FREEGLUT_BUILD_DEMOS )
 		ADD_EXECUTABLE(${name} ${ARGN})