|
From: Yoda-JM <yo...@us...> - 2009-09-23 15:17:43
|
Module: performous
Branch: master
Commit: 597899b036a8d442cabeb3fd5e81a5346be23273
Author: Vincent Le Ligeour <yo...@us...>
Date: Wed Sep 23 17:14:18 2009 +0200
Made editor not build by default, Fixed Magick library detection
---
cmake/Modules/FindMagick.cmake | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/cmake/Modules/FindMagick.cmake b/cmake/Modules/FindMagick.cmake
index 9ebd457..089c7d2 100644
--- a/cmake/Modules/FindMagick.cmake
+++ b/cmake/Modules/FindMagick.cmake
@@ -21,17 +21,18 @@ find_library(Magick_LIBRARY
NAMES Magick MagickCore
PATHS ${Magick_PKGCONF_LIBRARY_DIRS}
)
+set(Magick_PROCESS_LIBS Magick_LIBRARY)
if(MINGW)
find_library(MagickWand_LIBRARY
NAMES MagickWand
PATHS ${Magick_PKGCONF_LIBRARY_DIRS}
)
+ set(Magick_PROCESS_LIBS ${Magick_PROCESS_LIBS} MagickWand_LIBRARY)
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 MagickWand_LIBRARY)
libfind_process(Magick)
|