From 6eee949142947236c2d5f734f6b38d62fa4ab152 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 22 Mar 2007 13:38:23 +0000 Subject: [PATCH] From Eric Wing, added ${MATH_LIB} to osg CMakeLists.txt and definition of this to m under unix --- CMakeLists.txt | 6 ++++-- src/osg/CMakeLists.txt | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a40cb9f23..52630ef01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,6 +60,8 @@ IF(UNIX) # Not sure what this will do on Cygwin and Msys # Also, remember OS X X11 is a user installed option so it may not exist. FIND_PACKAGE(X11) + # Some Unicies need explicit linkage to the Math library or the build fails. + FIND_LIBRARY(MATH_LIBRARY m) ENDIF(UNIX) # Make the headers visible to everything @@ -108,8 +110,8 @@ ENDIF(WIN32) # Common to all platforms: FIND_PACKAGE(FreeType) - -# Common to all platforms: +FIND_PACKAGE(GLUT) +FIND_PACKAGE(SDL) FIND_PACKAGE(Inventor) # Platform specific: diff --git a/src/osg/CMakeLists.txt b/src/osg/CMakeLists.txt index b5bcb47bc..06cd7cf4b 100644 --- a/src/osg/CMakeLists.txt +++ b/src/osg/CMakeLists.txt @@ -293,6 +293,7 @@ ADD_LIBRARY(${LIB_NAME} TARGET_LINK_LIBRARIES(${LIB_NAME} ${OPENTHREADS_LIBRARY} ${OPENGL_LIBRARIES} + ${MATH_LIBRARY} ) INCLUDE(ModuleInstall OPTIONAL)