Text archives Help

---

Author: abe
Date: Wed Dec 14 16:43:09 2005
New Revision: 789

Modified:
   trunk/Core/XUtils/XHelper.cc
   trunk/fox/CMakeLists.txt
Log:


Removed debugging output.
M    Core/XUtils/XHelper.cc

Modified build to search for libtiff and libjpeg and include them in the link 
only if they are available. Fix allows building on Mac.
M    fox/CMakeLists.txt


Modified: trunk/Core/XUtils/XHelper.cc
==============================================================================
--- trunk/Core/XUtils/XHelper.cc        (original)
+++ trunk/Core/XUtils/XHelper.cc        Wed Dec 14 16:43:09 2005
@@ -16,8 +16,8 @@
 XFontStruct* XHelper::getX11Font(Display* dpy,
                                  const char* fontstring) {
   // Should we lock X?
-  cerr << "XHelper::getX11Font: Trying to load in font:\n"
-       << fontstring << "\n";
+  // cerr << "XHelper::getX11Font: Trying to load in font:\n"
+  //      << fontstring << "\n";
   return XLoadQueryFont(dpy, fontstring);
 }
 

Modified: trunk/fox/CMakeLists.txt
==============================================================================
--- trunk/fox/CMakeLists.txt    (original)
+++ trunk/fox/CMakeLists.txt    Wed Dec 14 16:43:09 2005
@@ -56,7 +56,18 @@
     )
 
   # Determine other libraries to link with
-  SET(FOX_X11_LIBRARIES m jpeg png tiff)
+  SET(FOX_X11_LIBRARIES m png)
+
+  # Look for tiff and jpeg
+  FIND_LIBRARY( FOUND_TIFF_LIB NAMES tiff PATHS /usr/lib /usr/local/lib DOC 
"Only required if Fox linked w/ tiff")
+  IF(FOUND_TIFF_LIB)
+    SET(FOX_X11_LIBRARIES ${FOX_X11_LIBRARIES} tiff)
+  ENDIF(FOUND_TIFF_LIB)
+
+  FIND_LIBRARY( FOUND_JPEG_LIB NAMES jpeg PATHS /usr/lib /usr/local/lib DOC 
"Only required if Fox linked w/ jpeg")
+  IF(FOUND_JPEG_LIB)
+    SET(FOX_X11_LIBRARIES ${FOX_X11_LIBRARIES} jpeg)
+  ENDIF(FOUND_JPEG_LIB)
 
   # Append Xcursor if it is available.
   FIND_LIBRARY( FOUND_XCURSOR NAMES Xcursor PATHS /usr/X11R6/lib DOC "Only 
required if Fox linked w/ Xcursor")    

---

• [MANTA] r789 - in trunk: Core/XUtils fox, abe, 12/14/2005

---

Archive powered by MHonArc 2.6.16.