|
From: Yoda-JM <yo...@us...> - 2009-09-23 13:52:20
|
Module: performous
Branch: master
Commit: 6f4bf3cb1ad53dabe24b7a31917f621966e93e4c
Author: Vincent Le Ligeour <yo...@us...>
Date: Wed Sep 23 15:52:05 2009 +0200
Tried to fix the Windows detection of MagickWand
---
cmake/Modules/FindMagick.cmake | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/cmake/Modules/FindMagick.cmake b/cmake/Modules/FindMagick.cmake
index d53e020..f2a32c3 100644
--- a/cmake/Modules/FindMagick.cmake
+++ b/cmake/Modules/FindMagick.cmake
@@ -17,10 +17,17 @@ 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
+ PATHS ${Magick_PKGCONF_LIBRARY_DIRS}
+ )
+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.
|