r14516 by cbradney - Add WANT_GRAPHICSMAGICK option to CMake builds

scribus-commit scribus-commit at lists.scribus.net
Tue Jan 12 23:45:18 CET 2010


Revision: 14516
Author: cbradney
Date: 2010-01-12T09:14:50.313645Z
Commit message: Add WANT_GRAPHICSMAGICK option to CMake builds

Changeset: 
M  /trunk/Scribus/CMakeLists.txt

Diffs:
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 14515)
+++ CMakeLists.txt	(revision 14516)
@@ -497,7 +497,7 @@
 #>> ZLIB, PNG
 
 IF (WANT_NOOSG)
-    MESSAGE("Building without 3D-Extension")
+	MESSAGE("Building without 3D Extension")
 ELSE (WANT_NOOSG)
   FIND_PACKAGE(OSG)
   IF(OSG_FOUND)
@@ -505,7 +505,7 @@
     SET(HAVE_OSG 1)
     FIND_PACKAGE(OpenGL)
   ELSE(OSG_FOUND)
-    MESSAGE("No OSG found, building without 3D-Extension")
+	MESSAGE("No OSG found, building without 3D Extension")
   ENDIF(OSG_FOUND)
 ENDIF (WANT_NOOSG)
 
@@ -672,13 +672,17 @@
 #>>PoDoFo for AI PDF import
 
 #<<GraphicksMagick++ for image import
-SET(GMAGICK_DIR ${CMAKE_MODULE_PATH})
-FIND_PACKAGE(GMAGICK)
-IF(GMAGICK_FOUND)
-  MESSAGE("GraphicksMagick++ Found OK")
-ELSE(GMAGICK_FOUND)
-  MESSAGE("GraphicksMagick++ NOT found! Building without additional image format support!")
-ENDIF(GMAGICK_FOUND)
+IF (WANT_GRAPHICSMAGICK)
+  SET(GMAGICK_DIR ${CMAKE_MODULE_PATH})
+  FIND_PACKAGE(GMAGICK)
+  IF(GMAGICK_FOUND)
+	MESSAGE("GraphicksMagick++ Found OK")
+  ELSE(GMAGICK_FOUND)
+	MESSAGE("GraphicksMagick++ NOT found! Building without additional image format support!")
+  ENDIF(GMAGICK_FOUND)
+ELSE (WANT_GRAPHICSMAGICK)
+  MESSAGE("Building without GraphicksMagick++")
+ENDIF (WANT_GRAPHICSMAGICK)
 #>>GraphicksMagick++ for image import
 
 ##############################################################################################################




More information about the scribus-commit mailing list