Revision: 54032
http://brlcad.svn.sourceforge.net/brlcad/?rev=54032&view=rev
Author: brlcad
Date: 2012-12-09 20:56:45 +0000 (Sun, 09 Dec 2012)
Log Message:
-----------
x11 is available on windows, so don't make it impossible to use it. we can
just let the checks fall through after looking for it and testing whether aqua
is enabled. this allows a slew of simlifications eliminating several of the
win32 and apple platform checks, which are bad smells anyways.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2012-12-09 20:50:47 UTC (rev 54031)
+++ brlcad/trunk/CMakeLists.txt 2012-12-09 20:56:45 UTC (rev 54032)
@@ -1005,20 +1005,27 @@
# Install example BRL-CAD Geometry Files
option(BRLCAD_INSTALL_EXAMPLE_GEOMETRY "Install the example BRL-CAD geometry
files." ON)
-# Enable features requiring X11
+# test for X11 on all platforms since we don't know when/where we'll find it
+include(${BRLCAD_CMAKE_DIR}/FindX11.cmake)
+
+# Set whether X11 is enabled or disabled by default
if(WIN32)
+ # even if there is x11, we default to native
option(BRLCAD_ENABLE_X11 "Use X11." OFF)
- mark_as_advanced(BRLCAD_ENABLE_X11)
elseif(BRLCAD_ENABLE_AQUA)
+ # aqua implies no X11
option(BRLCAD_ENABLE_X11 "Use X11." OFF)
else(WIN32)
- include(${BRLCAD_CMAKE_DIR}/FindX11.cmake)
+ # make everywhere else depend on whether we found a suitable X11
if(X11_X11_LIB AND X11_Xext_LIB AND X11_Xi_LIB)
option(BRLCAD_ENABLE_X11 "Use X11." ON)
else(X11_X11_LIB AND X11_Xext_LIB AND X11_Xi_LIB)
option(BRLCAD_ENABLE_X11 "Use X11." OFF)
endif(X11_X11_LIB AND X11_Xext_LIB AND X11_Xi_LIB)
endif(WIN32)
+mark_as_advanced(BRLCAD_ENABLE_X11)
+
+# if X11 is enabled, make sure aqua is off
if(BRLCAD_ENABLE_X11)
set(BRLCAD_ENABLE_AQUA OFF CACHE STRING "Don't use Aqua if we're doing X11"
FORCE)
set(OPENGL_USE_AQUA OFF CACHE STRING "Don't use Aqua if we're doing X11"
FORCE)
@@ -1029,22 +1036,12 @@
# be on, as a lot of functionality in BRL-CAD depends on Tk
option(BRLCAD_ENABLE_TK "Enable features requiring the Tk toolkit" ON)
mark_as_advanced(BRLCAD_ENABLE_TK)
-if(NOT WIN32)
- if(APPLE)
- if(NOT BRLCAD_ENABLE_X11 AND NOT BRLCAD_ENABLE_AQUA)
- set(BRLCAD_ENABLE_TK OFF)
- endif(NOT BRLCAD_ENABLE_X11 AND NOT BRLCAD_ENABLE_AQUA)
- if(BRLCAD_ENABLE_X11)
- set(TK_X11_GRAPHICS ON CACHE STRING "Need X11 Tk" FORCE)
- endif(BRLCAD_ENABLE_X11)
- else(APPLE)
- if(NOT BRLCAD_ENABLE_X11)
- set(BRLCAD_ENABLE_TK OFF)
- else(NOT BRLCAD_ENABLE_X11)
- set(TK_X11_GRAPHICS ON CACHE STRING "Need X11 Tk" FORCE)
- endif(NOT BRLCAD_ENABLE_X11)
- endif(APPLE)
-endif(NOT WIN32)
+if(NOT BRLCAD_ENABLE_X11 AND NOT BRLCAD_ENABLE_AQUA)
+ set(BRLCAD_ENABLE_TK OFF)
+endif(NOT BRLCAD_ENABLE_X11 AND NOT BRLCAD_ENABLE_AQUA)
+if(BRLCAD_ENABLE_X11)
+ set(TK_X11_GRAPHICS ON CACHE STRING "Need X11 Tk" FORCE)
+endif(BRLCAD_ENABLE_X11)
# Enable features requiring OPENGL
# Be smart about this - if we don't have X11 or Aqua and we're
@@ -1054,29 +1051,12 @@
# about that... for now, on Win32 don't try OpenGL if Tk is
# off. That'll hold until we get a non-Tk based GUI - then
# setting non-graphical on Windows will take more thought.
-if(NOT WIN32)
- 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)
- endif(APPLE)
-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)
+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)
set(BRLCAD_ENABLE_OPENGL_ALIASES
ENABLE_OPENGL
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
