From 6ccecf0bc6222c34ea41e944fc5fbb043924fbc7 Mon Sep 17 00:00:00 2001
From: Sara Golemon <sgolemon@fb.com>
Date: Thu, 20 Feb 2014 12:57:52 -0800
Subject: [PATCH] Add dependency on libMagickWand

---
 CMake/FindLibMagickWand.cmake | 46 +++++++++++++++++++++++++++++++++++++++++++
 CMake/HPHPFindLibs.cmake      |  5 +++++
 configure_ubuntu_12.04.sh     |  3 ++-
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 CMake/FindLibMagickWand.cmake

diff --git a/CMake/FindLibMagickWand.cmake b/CMake/FindLibMagickWand.cmake
new file mode 100644
index 00000000000..40fa6ef1d78
--- /dev/null
+++ b/CMake/FindLibMagickWand.cmake
@@ -0,0 +1,46 @@
+# - Try to find libmagickwand
+# Once done this will define
+#
+#  LIBMAGICKWAND_FOUND - system has libmagickwand
+#  LIBMAGICKWAND_INCLUDE_DIRS - the libmagickwand include directory
+#  LIBMAGICKWAND_LIBRARIES - Link these to use libmagickwand
+#  LIBMAGICKWAND_DEFINITIONS - Compiler switches required for using libmagickwand
+#
+#  Copyright (c) 2008 Bernhard Walle <bernhard.walle@gmx.de>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+if (LIBMAGICKWAND_LIBRARIES AND LIBMAGICKWAND_INCLUDE_DIRS)
+  set (LibMagicWand_FIND_QUIETLY TRUE)
+endif (LIBMAGICKWAND_LIBRARIES AND LIBMAGICKWAND_INCLUDE_DIRS)
+
+find_path (LIBMAGICKWAND_INCLUDE_DIRS
+    NAMES
+      wand/MagickWand.h
+    PATHS
+      /usr/include/ImageMagick
+      /usr/local/include/ImageMagick
+    ENV CPATH)
+
+find_library (LIBMAGICKWAND_LIBRARIES
+    NAMES
+      MagickWand
+    PATHS
+      /usr/lib
+      /usr/local/lib
+      ENV LIBRARY_PATH
+      ENV LD_LIBRARY_PATH)
+
+include (FindPackageHandleStandardArgs)
+
+
+# handle the QUIETLY and REQUIRED arguments and set LIBMAGICKWAND_FOUND to TRUE if all listed variables are TRUE
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibMagicWand DEFAULT_MSG
+    LIBMAGICKWAND_LIBRARIES
+    LIBMAGICKWAND_INCLUDE_DIRS)
+
+mark_as_advanced(LIBMAGICKWAND_INCLUDE_DIRS LIBMAGICKWAND_LIBRARIES ELF_GETSHDRSTRNDX)
diff --git a/CMake/HPHPFindLibs.cmake b/CMake/HPHPFindLibs.cmake
index 543c4024a7a..6c1df6a0977 100644
--- a/CMake/HPHPFindLibs.cmake
+++ b/CMake/HPHPFindLibs.cmake
@@ -43,6 +43,10 @@ if (FEATURES_HEADER)
 	add_definitions("-DHAVE_FEATURES_H=1")
 endif()
 
+# magickwand
+find_package(LibMagickWand REQUIRED)
+include_directories(${LIBMAGICKWAND_INCLUDE_DIRS})
+
 # google-glog
 find_package(Glog REQUIRED)
 include_directories(${LIBGLOG_INCLUDE_DIR})
@@ -441,6 +445,7 @@ macro(hphp_link target)
 	target_link_libraries(${target} ${LIBEVENT_LIB})
 	target_link_libraries(${target} ${CURL_LIBRARIES})
 	target_link_libraries(${target} ${LIBGLOG_LIBRARY})
+	target_link_libraries(${target} ${LIBMAGICKWAND_LIBRARIES})
 
 if (LibXed_LIBRARY)
 	target_link_libraries(${target} ${LibXed_LIBRARY})
diff --git a/configure_ubuntu_12.04.sh b/configure_ubuntu_12.04.sh
index e77043a21c5..2eaccfef79c 100755
--- a/configure_ubuntu_12.04.sh
+++ b/configure_ubuntu_12.04.sh
@@ -39,7 +39,8 @@ sudo apt-fast -y install git-core cmake g++ libboost1.48-dev libmysqlclient-dev
   libboost-program-options1.48-dev libboost-filesystem1.48-dev libboost-thread1.48-dev \
   wget memcached libreadline-dev libncurses-dev libmemcached-dev libbz2-dev \
   libc-client2007e-dev php5-mcrypt php5-imagick libgoogle-perftools-dev \
-  libcloog-ppl0 libelf-dev libdwarf-dev libunwind7-dev subversion &
+  libcloog-ppl0 libelf-dev libdwarf-dev libunwind7-dev subversion \
+  libmagickwand-dev &
 
 git clone git://github.com/libevent/libevent.git --quiet &
 git clone git://github.com/bagder/curl.git --quiet &
-- 
2.11.4.GIT