[Performous-commit] John Stumpo : Don't require Magick++ to be present if SDL_image is present.

[John S. <jst...@us...>]

Module: performous
Branch: master
Commit: 3f2b0c4ab1b876a9fdd38906b7e9ccbff51e0469

Author: John Stumpo <st...@js...>
Date:   Wed Dec 23 00:17:58 2009 -0500

Don't require Magick++ to be present if SDL_image is present.

---

 game/CMakeLists.txt |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index a7f51ab..bf08bf2 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -44,7 +44,7 @@ else()
 endif()
 
 # Find all the libs that don't require extra parameters
-foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ Magick++ GLEW AVFormat SWScale OpenGL Z Jpeg Tiff Png)
+foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ GLEW AVFormat SWScale OpenGL Z Jpeg Tiff Png)
 	find_package(${lib} REQUIRED)
 	include_directories(${${lib}_INCLUDE_DIRS})
 	list(APPEND LIBS ${${lib}_LIBRARIES})
@@ -79,6 +79,10 @@ if(SDL_image_FOUND)
   message(STATUS "SDL_image: found, enabling replacements for Magick++ code")
 else()
   message(STATUS "SDL_image: not found, falling back to Magick++")
+  find_package(Magick++ REQUIRED)
+  include_directories(${Magick++_INCLUDE_DIRS})
+  list(APPEND LIBS ${Magick++_LIBRARIES})
+  add_definitions(${Magick++_DEFINITIONS})
 endif()
 
 # Set default compile flags for GCC