Revision: 40606
http://brlcad.svn.sourceforge.net/brlcad/?rev=40606&view=rev
Author: starseeker
Date: 2010-09-18 16:06:12 +0000 (Sat, 18 Sep 2010)
Log Message:
-----------
Whoops - put defs in config file AFTER doing the find...
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-18 11:13:38 UTC (rev
40605)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-18 16:06:12 UTC (rev
40606)
@@ -437,12 +437,6 @@
# Enable features requring OPENGL
OPTION(BRLCAD-ENABLE_OPENGL "Use OpenGL." ON)
-if (OPENGL_INCLUDE_DIR_GL)
- FILE(APPEND ${CONFIG_H_FILE} "#define HAVE_GL_GL_H 1\n")
-endif (OPENGL_INCLUDE_DIR_GL)
-if (OPENGL_INCLUDE_DIR_GLX)
- FILE(APPEND ${CONFIG_H_FILE} "#define HAVE_GL_GLX_H 1\n")
-endif (OPENGL_INCLUDE_DIR_GLX)
# Enable RTGL. Requires an enabled OpenGL.
# IF(BRLCAD-ENABLE_OPENGL)
@@ -664,7 +658,13 @@
# OpenGL graphics
if(BRLCAD-ENABLE_OPENGL)
- INCLUDE(${BRLCAD_CMAKE_DIR}/FindGL.cmake)
+ INCLUDE(${BRLCAD_CMAKE_DIR}/FindGL.cmake)
+ if (OPENGL_INCLUDE_DIR_GL)
+ FILE(APPEND ${CONFIG_H_FILE} "#define HAVE_GL_GL_H 1\n")
+ endif (OPENGL_INCLUDE_DIR_GL)
+ if (OPENGL_INCLUDE_DIR_GLX)
+ FILE(APPEND ${CONFIG_H_FILE} "#define HAVE_GL_GLX_H 1\n")
+ endif (OPENGL_INCLUDE_DIR_GLX)
endif (BRLCAD-ENABLE_OPENGL)
# SGI graphics library
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
