Revision: 54023
http://brlcad.svn.sourceforge.net/brlcad/?rev=54023&view=rev
Author: starseeker
Date: 2012-12-07 16:33:11 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Move FindX11 up in the logic, don't enable by default if it isn't found.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2012-12-07 15:58:56 UTC (rev 54022)
+++ brlcad/trunk/CMakeLists.txt 2012-12-07 16:33:11 UTC (rev 54023)
@@ -1012,7 +1012,12 @@
elseif(BRLCAD_ENABLE_AQUA)
option(BRLCAD_ENABLE_X11 "Use X11." OFF)
else(WIN32)
- option(BRLCAD_ENABLE_X11 "Use X11." ON)
+ include(${BRLCAD_CMAKE_DIR}/FindX11.cmake)
+ 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)
if(BRLCAD_ENABLE_X11)
set(BRLCAD_ENABLE_AQUA OFF CACHE STRING "Don't use Aqua if we're doing X11"
FORCE)
@@ -1479,7 +1484,6 @@
# Mark X11 as available if it is enabled and we find Xlib.h
if(BRLCAD_ENABLE_X11)
- include(${BRLCAD_CMAKE_DIR}/FindX11.cmake)
if(X11_Xlib_INCLUDE_PATH AND CONFIG_H_FILE)
set(HAVE_X11_XLIB_H 1)
CONFIG_H_APPEND(BRLCAD "#cmakedefine HAVE_X11_XLIB_H 1\n")
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
