diff options
| author | Sebastien Barre <sebastien.barre@kitware.com> | 2002-06-13 15:48:28 (GMT) |
|---|---|---|
| committer | Sebastien Barre <sebastien.barre@kitware.com> | 2002-06-13 15:48:28 (GMT) |
| commit | 5380afe02b0fa1f7d212e8639981e0df524315ac (patch) | |
| tree | aae96091a25c77a537d407dcaafbb8943227b646 | |
| parent | e57d209bdcb092d86bc9e0d2c2d6a0adf229bfc5 (diff) | |
| download | CMake-5380afe02b0fa1f7d212e8639981e0df524315ac.zip CMake-5380afe02b0fa1f7d212e8639981e0df524315ac.tar.gz CMake-5380afe02b0fa1f7d212e8639981e0df524315ac.tar.bz2 | |
ENH: make all OpenGL libs advanced, and add support for glu lib with Borland
| -rw-r--r-- | Modules/FindGLU.cmake | 13 | ||||
| -rw-r--r-- | Modules/FindGLUT.cmake | 7 | ||||
| -rw-r--r-- | Modules/FindOpenGL.cmake | 11 |
3 files changed, 28 insertions, 3 deletions
diff --git a/Modules/FindGLU.cmake b/Modules/FindGLU.cmake index 75ac7e0..8b795ad 100644 --- a/Modules/FindGLU.cmake +++ b/Modules/FindGLU.cmake @@ -7,7 +7,11 @@ # IF (WIN32) - SET (GLU_LIBRARY glu32 CACHE STRING "GLU library for win32") + IF(BORLAND) + SET (GLU_LIBRARY import32 CACHE STRING "GLU library for win32") + ELSE(BORLAND) + SET (GLU_LIBRARY glu32 CACHE STRING "GLU library for win32") + ENDIF(BORLAND) ELSE (WIN32) FIND_PATH(GLU_INCLUDE_PATH GL/gl.h /usr/include @@ -16,6 +20,9 @@ ELSE (WIN32) /opt/graphics/OpenGL/include /usr/X11R6/include ) + MARK_AS_ADVANCED( + GLU_INCLUDE_PATH + ) FIND_LIBRARY(GLU_LIBRARY GLU /usr/lib @@ -26,3 +33,7 @@ ELSE (WIN32) ) ENDIF (WIN32) + +MARK_AS_ADVANCED( + GLU_LIBRARY +) diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake index cf2ffbb..c8c0329 100644 --- a/Modules/FindGLUT.cmake +++ b/Modules/FindGLUT.cmake @@ -18,6 +18,9 @@ ELSE (WIN32) /opt/graphics/OpenGL/include /usr/X11R6/include ) + MARK_AS_ADVANCED( + GLUT_INCLUDE_PATH + ) FIND_LIBRARY(GLUT_LIBRARY glut /usr/lib @@ -28,3 +31,7 @@ ELSE (WIN32) ) ENDIF (WIN32) + +MARK_AS_ADVANCED( + GLUT_LIBRARY +) diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake index 3232358..2bfab63 100644 --- a/Modules/FindOpenGL.cmake +++ b/Modules/FindOpenGL.cmake @@ -23,7 +23,10 @@ ELSE (WIN32) /opt/graphics/OpenGL/include /usr/X11R6/include ) - + MARK_AS_ADVANCED( + OPENGL_INCLUDE_PATH + ) + FIND_LIBRARY(OPENGL_LIBRARY GL /usr/lib /usr/local/lib @@ -32,4 +35,8 @@ ELSE (WIN32) /usr/X11R6/lib ) ENDIF (APPLE) -ENDIF (WIN32)
\ No newline at end of file +ENDIF (WIN32) + +MARK_AS_ADVANCED( + OPENGL_LIBRARY +) |