summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Starreveld <ystarrev@uwo.ca>2002-07-18 22:43:22 (GMT)
committerYves Starreveld <ystarrev@uwo.ca>2002-07-18 22:43:22 (GMT)
commitc8ed9d7452a5990e8dcfe566c508bfb85b7baf2d (patch)
treefa023661c7257dafa12da9cc99a18e1f894c80f9
parent22ae78d92fc515664f4feb8e5b99de7621a292a5 (diff)
downloadCMake-c8ed9d7452a5990e8dcfe566c508bfb85b7baf2d.zip
CMake-c8ed9d7452a5990e8dcfe566c508bfb85b7baf2d.tar.gz
CMake-c8ed9d7452a5990e8dcfe566c508bfb85b7baf2d.tar.bz2
ERR: remove automatic Carbon framework on osx
-rw-r--r--Modules/FindGLU.cmake2
-rw-r--r--Modules/FindOpenGL.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindGLU.cmake b/Modules/FindGLU.cmake
index e349227..e752e1a 100644
--- a/Modules/FindGLU.cmake
+++ b/Modules/FindGLU.cmake
@@ -18,7 +18,7 @@ ELSE (WIN32)
# this variable is used in a IF test. So let's set it to the OpenGL
# framework. It does not harm to duplicate the OpenGL framework and it
# might even help in case OPENGL_LIBRARY is not set.
- SET(GLU_LIBRARY "-framework Carbon -framework AGL -framework OpenGL" CACHE STRING "GLU library for OSX")
+ SET(GLU_LIBRARY "-framework AGL -framework OpenGL" CACHE STRING "GLU library for OSX")
ELSE (APPLE)
FIND_PATH(GLU_INCLUDE_PATH GL/glu.h
${OPENGL_INCLUDE_PATH}
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake
index da99e90..119d1ee 100644
--- a/Modules/FindOpenGL.cmake
+++ b/Modules/FindOpenGL.cmake
@@ -14,7 +14,7 @@ IF (WIN32)
ENDIF(BORLAND)
ELSE (WIN32)
IF (APPLE)
- SET(OPENGL_LIBRARY "-framework Carbon -framework AGL -framework OpenGL" CACHE STRING "OpenGL library for OSX")
+ SET(OPENGL_LIBRARY "-framework AGL -framework OpenGL" CACHE STRING "OpenGL library for OSX")
ELSE (APPLE)
FIND_PATH(OPENGL_INCLUDE_PATH GL/gl.h
/usr/include