r19911 by craig - Fix annoying cmake for GraphicsMagick warnings and move to finding GraphicsMagick++

[scribus-commit]

Author: craig
Date: Wed Mar 11 23:41:38 2015
New Revision: 19911

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19911
Log:
Fix annoying cmake for GraphicsMagick warnings and move to finding GraphicsMagick++

Modified:
    trunk/Scribus/cmake/modules/FindGMAGICK.cmake
    trunk/Scribus/scribus/CMakeLists.txt

Modified: trunk/Scribus/cmake/modules/FindGMAGICK.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19911&path=/trunk/Scribus/cmake/modules/FindGMAGICK.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindGMAGICK.cmake (original)
+++ trunk/Scribus/cmake/modules/FindGMAGICK.cmake Wed Mar 11 23:41:38 2015
@@ -10,7 +10,7 @@
 include(FindPkgConfig)
 
 # Use pkg-config to get hints about paths
-pkg_check_modules(GMAGICK_PKGCONF GraphicsMagick)
+pkg_check_modules(GMAGICK_PKGCONF GraphicsMagick++)
 
 # Include dir
 find_path(GMAGICK_INCLUDE_DIR
@@ -28,9 +28,9 @@
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMAGICK DEFAULT_MSG GMAGICK_LIBRARY GMAGICK_INCLUDE_DIR)
 IF(GMAGICK_FOUND)
-    set(GMAGICK_INCLUDES ${GMAGICK_INCLUDE_DIR}/GraphicsMagick)
-    set(GMAGICK_LIBRARIES ${GMAGICK_LIBRARY})
+	set(GMAGICK_INCLUDES " ${GMAGICK_INCLUDE_DIR}/GraphicsMagick")
+	set(GMAGICK_LIBRARIES " ${GMAGICK_LIBRARY}")
 ELSE()
-    set(GMAGICK_INCLUDES)
-    set(GMAGICK_LIBRARIES)
+	set(GMAGICK_INCLUDES)
+	set(GMAGICK_LIBRARIES)
 ENDIF()

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19911&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Wed Mar 11 23:41:38 2015
@@ -1077,7 +1077,7 @@
 		BEFORE ${GMAGICK_INCLUDE_DIRS}
 	)
 	LINK_DIRECTORIES(
-		${GMAGICK_LDFLAGS} #TODO
+		${GMAGICK_LIBRARY}
 	)
 ENDIF(GMAGICK_FOUND)