r17563 by craig - Remove WANT_PRIVATE_CAIRO option from CMake options - it now sets WANT_SYSTEM_CAIRO, as private cairo is broken, broken, b0rken

[scribus-commit]

Author: craig
Date: Thu Jun 14 19:34:51 2012
New Revision: 17563

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17563
Log:
Remove WANT_PRIVATE_CAIRO option from CMake options - it now sets WANT_SYSTEM_CAIRO, as private cairo is broken, broken, b0rken

Modified:
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/TODO

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17563&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Thu Jun 14 19:34:51 2012
@@ -583,12 +583,16 @@
 # If we have a RENDER_LIB selected from a previous cmake run, then use it
 # otherwise, we should be defaulting to cairo private branch
 IF(WANT_PRIVATE_CAIRO)
- MESSAGE("Using private CAIRO Library")
- SET(RENDER_LIB "CAIRO_PRIVATE" CACHE TYPE STRING)
- SET(HAVE_CAIRO 1)
- SET(HAVE_PRIVATE_CAIRO 1)
- SET( CAIRO_FOUND "YES" )
-ELSE(WANT_PRIVATE_CAIRO)
+ MESSAGE("We no longer support the private cairo library as the latest public release is more up to date, setting WANT_SYSTEM_CAIRO=1")
+ SET(WANT_SYSTEM_CAIRO 1)
+ SET(WANT_PRIVATE_CAIRO 0)
+ #MESSAGE("Using private CAIRO Library")
+ #SET(RENDER_LIB "CAIRO_PRIVATE" CACHE TYPE STRING)
+ #SET(HAVE_CAIRO 1)
+ #SET(HAVE_PRIVATE_CAIRO 1)
+ #SET( CAIRO_FOUND "YES" )
+ENDIF(WANT_PRIVATE_CAIRO)
+IF(NOT WANT_PRIVATE_CAIRO)
  IF(RENDER_LIB)
   MESSAGE(STATUS "Previously selected rendering system: ${RENDER_LIB}")
   IF (RENDER_LIB STREQUAL "QTARTHUR")
@@ -627,7 +631,7 @@
    MESSAGE(FATAL_ERROR "Cairo >= 1.5.16 is required for Windows build")  
   ENDIF (NOT HAVE_CAIRO)
  ENDIF (WIN32)
-ENDIF(WANT_PRIVATE_CAIRO)
+ENDIF(NOT WANT_PRIVATE_CAIRO)
 #>>Render Library
 
 #<<CUPS

Modified: trunk/Scribus/TODO
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17563&path=/trunk/Scribus/TODO
==============================================================================
--- trunk/Scribus/TODO (original)
+++ trunk/Scribus/TODO Thu Jun 14 19:34:51 2012
@@ -1,2 +1,3 @@
 The roadmap for the next release can be seen on bugs.scribus.net website.
+
 Always lots to do.. ask if you have time to help :)