[Performous-commit] Vincent Le Ligeour : Fixed the latest fix ... again :)

[Yoda-JM <yo...@us...>]

Module: performous
Branch: master
Commit: cac4168e9cc148c0805fdc81b650b75ce211181c

Author: Vincent Le Ligeour <yo...@us...>
Date:   Wed Sep 23 16:10:51 2009 +0200

Fixed the latest fix ... again :)

---

 cmake/Modules/FindMagick.cmake |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cmake/Modules/FindMagick.cmake b/cmake/Modules/FindMagick.cmake
index f2a32c3..9ebd457 100644
--- a/cmake/Modules/FindMagick.cmake
+++ b/cmake/Modules/FindMagick.cmake
@@ -17,14 +17,14 @@ find_path(Magick_INCLUDE_DIR
 )
 
 # Finally the library itself
+find_library(Magick_LIBRARY
+  NAMES Magick MagickCore
+  PATHS ${Magick_PKGCONF_LIBRARY_DIRS}
+)
+
 if(MINGW)
-  find_library(Magick_LIBRARY
-    NAMES Magick MagickCore MagickWand
-    PATHS ${Magick_PKGCONF_LIBRARY_DIRS}
-  )
-else(MINGW)
-  find_library(Magick_LIBRARY
-    NAMES Magick MagickCore
+  find_library(MagickWand_LIBRARY
+    NAMES MagickWand
     PATHS ${Magick_PKGCONF_LIBRARY_DIRS}
   )
 endif(MINGW)
@@ -32,6 +32,6 @@ endif(MINGW)
 # Set the include dir variables and the libraries and let libfind_process do the rest.
 # NOTE: Singular variables for this library, plural for libraries this this lib depends on.
 set(Magick_PROCESS_INCLUDES Magick_INCLUDE_DIR)
-set(Magick_PROCESS_LIBS Magick_LIBRARY)
+set(Magick_PROCESS_LIBS Magick_LIBRARY MagickWand_LIBRARY)
 libfind_process(Magick)