[Plplot-cvs] plplot/cmake/modules freetype.cmake,1.1,1.2

[Alan W. I. <ai...@us...>]

Update of /cvsroot/plplot/plplot/cmake/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1427

Modified Files:
	freetype.cmake 
Log Message:
Straighten out EXISTS logic which does not allow BOOLEAN operators.


Index: freetype.cmake
===================================================================
RCS file: /cvsroot/plplot/plplot/cmake/modules/freetype.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- freetype.cmake	22 Jul 2006 14:07:39 -0000	1.1
+++ freetype.cmake	22 Jul 2006 17:17:35 -0000	1.2
@@ -87,14 +87,23 @@
 endforeach(FONT_ENTRY PL_FREETYPE_FONT_LIST) 
 
 # Check a couple of fonts actually exists
-if (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SANS} AND EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SYMBOL})  
-else (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SANS} AND EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SYMBOL})
+if (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SANS})
+  if (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SYMBOL})  
+  else (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SYMBOL})
+    message("Fonts not found - disabling freetype")
+    set(WITH_FREETYPE OFF CACHE BOOL 
+    "Enable driver options for using freetype library for fonts" FORCE
+    )  
+  endif (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SYMBOL})  
+else (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SANS})
   message("Fonts not found - disabling freetype")
-  set(WITH_FREETYPE OFF CACHE BOOL "Enable driver options for using freetype library for fonts" FORCE)  
+  set(WITH_FREETYPE OFF CACHE BOOL 
+  "Enable driver options for using freetype library for fonts" FORCE
+  )
 endif (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SANS} AND EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SYMBOL})
 
 endif (WITH_FREETYPE)
 
 if (WITH_FREETYPE)
   set(HAVE_FREETYPE ON)
-endif (WITH_FREETYPE)
\ No newline at end of file
+endif (WITH_FREETYPE)