r17970 by craig - Fix some CMake indentation, really make sure private cairo is not used if not selected

[scribus-commit]

Author: craig
Date: Tue Dec 18 22:17:38 2012
New Revision: 17970

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17970
Log:
Fix some CMake indentation, really make sure private cairo is not used if not selected

Modified:
    trunk/Scribus/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17970&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Tue Dec 18 22:17:38 2012
@@ -587,23 +587,26 @@
 # 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("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" )
+  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")
-   MESSAGE("Qt4's Arthur as renderer is not supported anymore, performing renderer detection again")
-   SET(OLDRENDERLIBLOST TRUE)
-  ENDIF (RENDER_LIB STREQUAL "QTARTHUR")
- ENDIF(RENDER_LIB)
+  IF(RENDER_LIB)
+	MESSAGE(STATUS "Previously selected rendering system: ${RENDER_LIB}")
+	IF (RENDER_LIB STREQUAL "QTARTHUR")
+	  MESSAGE("Qt4's Arthur as renderer is not supported anymore, performing renderer detection again")
+	  SET(OLDRENDERLIBLOST TRUE)
+	ENDIF (RENDER_LIB STREQUAL "QTARTHUR")
+  ELSE(RENDER_LIB)
+	SET(WANT_SYSTEM_CAIRO 1)
+	SET(WANT_PRIVATE_CAIRO 0)
+  ENDIF(RENDER_LIB)
 
  IF (WANT_SYSTEM_CAIRO OR RENDER_LIB STREQUAL "CAIRO_SYSTEM")
   SET(OLDRENDERLIBLOST FALSE)