[brlcad-commits] SF.net SVN: brlcad:[48100] brlcad/trunk/CMakeLists.txt

[<sta...@us...>]

Revision: 48100
          http://brlcad.svn.sourceforge.net/brlcad/?rev=48100&view=rev
Author:   starseeker
Date:     2011-12-21 06:31:49 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
Disable opengl like we mean it if the required criteria aren't met

Modified Paths:
--------------
    brlcad/trunk/CMakeLists.txt

Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt	2011-12-21 06:07:26 UTC (rev 48099)
+++ brlcad/trunk/CMakeLists.txt	2011-12-21 06:31:49 UTC (rev 48100)
@@ -831,12 +831,14 @@
 	IF(APPLE)
 		IF(NOT BRLCAD_ENABLE_X11 AND NOT BRLCAD_ENABLE_AQUA)
 			SET(OPENGL_FOUND OFF)
+			SET(BRLCAD_ENABLE_OPENGL OFF CACHE BOOL "Disabled - NOT BRLCAD_ENABLE_X11 AND NOT BRLCAD_ENABLE_AQUA" FORCE)
 		ELSE(NOT BRLCAD_ENABLE_X11 AND NOT BRLCAD_ENABLE_AQUA)
 			INCLUDE(${BRLCAD_CMAKE_DIR}/FindGL.cmake)
 		ENDIF(NOT BRLCAD_ENABLE_X11 AND NOT BRLCAD_ENABLE_AQUA)
 	ELSE(APPLE)
 		IF(NOT BRLCAD_ENABLE_X11)
 			SET(OPENGL_FOUND OFF)
+			SET(BRLCAD_ENABLE_OPENGL OFF CACHE BOOL "Disabled - NOT BRLCAD_ENABLE_X11" FORCE)
 		ELSE(NOT BRLCAD_ENABLE_X11)
 			INCLUDE(${BRLCAD_CMAKE_DIR}/FindGL.cmake)
 		ENDIF(NOT BRLCAD_ENABLE_X11)
@@ -844,6 +846,8 @@
 ELSE(NOT WIN32)
 	IF(BRLCAD_ENABLE_TK)
 		INCLUDE(${BRLCAD_CMAKE_DIR}/FindGL.cmake)
+	ELSE(BRLCAD_ENABLE_TK)
+		SET(BRLCAD_ENABLE_OPENGL OFF CACHE BOOL "Disabled - WIN32 AND NOT BRLCAD_ENABLE_TK" FORCE)
 	ENDIF(BRLCAD_ENABLE_TK)
 ENDIF(NOT WIN32)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.