Revision: 54094
http://brlcad.svn.sourceforge.net/brlcad/?rev=54094&view=rev
Author: caen23
Date: 2012-12-19 23:47:45 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
X11 is available if the required files in both include/ and lib/ can be found
(GCI: http://www.google-melange.com/gci/task/view/google/gci2012/7999218)
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/src/libfb/tcl.c
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2012-12-19 23:25:25 UTC (rev 54093)
+++ brlcad/trunk/CMakeLists.txt 2012-12-19 23:47:45 UTC (rev 54094)
@@ -1017,11 +1017,11 @@
option(BRLCAD_ENABLE_X11 "Use X11." OFF)
else(WIN32)
# make everywhere else depend on whether we found a suitable X11
- if(X11_X11_LIB AND X11_Xext_LIB AND X11_Xi_LIB)
+ if(X11_X11_LIB AND X11_Xext_LIB AND X11_Xi_LIB AND X11_Xlib_INCLUDE_PATH)
option(BRLCAD_ENABLE_X11 "Use X11." ON)
- else(X11_X11_LIB AND X11_Xext_LIB AND X11_Xi_LIB)
+ else(X11_X11_LIB AND X11_Xext_LIB AND X11_Xi_LIB AND X11_Xlib_INCLUDE_PATH)
option(BRLCAD_ENABLE_X11 "Use X11." OFF)
- endif(X11_X11_LIB AND X11_Xext_LIB AND X11_Xi_LIB)
+ endif(X11_X11_LIB AND X11_Xext_LIB AND X11_Xi_LIB AND X11_Xlib_INCLUDE_PATH)
endif(WIN32)
mark_as_advanced(BRLCAD_ENABLE_X11)
@@ -1462,13 +1462,6 @@
endif(JNI_FOUND AND JAVA_FOUND)
mark_as_advanced(BRLCAD_ENABLE_RTSERVER)
-# Mark X11 as available if it is enabled and we find Xlib.h
-if(BRLCAD_ENABLE_X11)
- 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")
- endif(X11_Xlib_INCLUDE_PATH AND CONFIG_H_FILE)
-endif(BRLCAD_ENABLE_X11)
# math library
BRLCAD_CHECK_LIBRARY(M m cos)
Modified: brlcad/trunk/src/libfb/tcl.c
===================================================================
--- brlcad/trunk/src/libfb/tcl.c 2012-12-19 23:25:25 UTC (rev 54093)
+++ brlcad/trunk/src/libfb/tcl.c 2012-12-19 23:47:45 UTC (rev 54094)
@@ -282,7 +282,7 @@
void
#if !defined(IF_X) && !defined(IF_WGL) && !defined(IF_OGL) && !defined(IF_TK)
-fb_configureWindow(FBIO *UNUSED(ifp), int UNUSED(width), int UNUSED(height))
+fb_configureWindow(FBIO *ifp, int UNUSED(width), int UNUSED(height))
#else
fb_configureWindow(FBIO *ifp, int width, int height)
#endif
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
