r14993 by fschmid - Fixed Cmake setup for private Cairo.

[scribus-commit]

Revision: 14993
Author: fschmid
Date: 2010-04-21T20:41:47.988803Z
Commit message: Fixed Cmake setup for private Cairo.

Changeset: 
M  /trunk/Scribus/scribus/CMakeLists.txt
M  /trunk/Scribus/scribus/third_party/CMakeLists.txt

Diffs:
Index: scribus/third_party/CMakeLists.txt
===================================================================
--- scribus/third_party/CMakeLists.txt	(revision 14992)
+++ scribus/third_party/CMakeLists.txt	(revision 14993)
@@ -1,6 +1,6 @@
-IF(HAVE_PRIVATE_CAIRO)
+IF(WANT_PRIVATE_CAIRO)
   ADD_SUBDIRECTORY(cairo)
-ENDIF(HAVE_PRIVATE_CAIRO)
+ENDIF(WANT_PRIVATE_CAIRO)
 
 IF(HAVE_OSG)
   ADD_SUBDIRECTORY(prc)
Index: scribus/CMakeLists.txt
===================================================================
--- scribus/CMakeLists.txt	(revision 14992)
+++ scribus/CMakeLists.txt	(revision 14993)
@@ -950,12 +950,12 @@
 
 #Set up libraries to link with all found packages
 
-IF(HAVE_PRIVATE_CAIRO)
+IF(WANT_PRIVATE_CAIRO)
 	SET(SCRIBUS_CAIRO_LIB "scribus_cairo_lib")
 	INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/third_party/cairo)
 	LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/third_party/cairo)
 	TARGET_LINK_LIBRARIES(${EXE_NAME} ${PIXMAN_LIBRARIES} ${SCRIBUS_CAIRO_LIB})
-ELSE(HAVE_PRIVATE_CAIRO)
+ELSE(WANT_PRIVATE_CAIRO)
 	#Select Libart_LGPL or Cairo
 	IF(RENDER_LIB STREQUAL "CAIRO")
 		INCLUDE_DIRECTORIES(${CAIRO_INCLUDE_DIR})
@@ -963,7 +963,7 @@
 		LINK_DIRECTORIES(${PREFIX_CAIRO_LIB})
 		SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};${PREFIX_CAIRO_LIB}")
 	ENDIF(RENDER_LIB STREQUAL "CAIRO")
-ENDIF(HAVE_PRIVATE_CAIRO)
+ENDIF(WANT_PRIVATE_CAIRO)
 
 MESSAGE("RPATH: ${CMAKE_INSTALL_RPATH}")