commit ec664fac96ce628140e1a3fe797c5a0ee6be73c8
author Chia-I Wu <olv@lunarg.com> Tue Dec 02 11:54:24 2014 +0800
committer Chia-I Wu <olv@lunarg.com> Wed Dec 03 10:34:50 2014 +0800
tree 2916f72413d38d050d1c9feb94ebb852ef6cf0d6
parent d89a3e1330b22cef9103706d2acb1d2e04c8dfc7

tests: fix build errors due to ImageMagick dependency

v2: tell users how to resolve the dependency on Ubuntu per Courtney's
    suggestion

tests/CMakeLists.txt

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c237a85..5327b69 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,11 +2,16 @@
 
 find_package (OpenGL REQUIRED)
 find_package (GLUT REQUIRED)
-find_package(ImageMagick REQUIRED MagickWand)
+find_package(ImageMagick COMPONENTS MagickWand)
+
 if(NOT EXISTS /usr/include/glm/glm.hpp)
     message(FATAL_ERROR "Necessary libglm-dev headers cannot be found: sudo apt-get install libglm-dev")
 endif()
 
+if(NOT ImageMagick_FOUND)
+    message(FATAL_ERROR "Missing ImageMagick library: sudo apt-get install libmagickwand-dev")
+endif()
+
 SET(COMMON_CPP
     xglgpu.cpp
     xgldevice.cpp
@@ -36,7 +41,7 @@
    OGLCompiler
    OSDependent
    BIL
-   MagickWand
+   ${ImageMagick_LIBRARIES}
    )
 
 include_directories(
@@ -45,9 +50,13 @@
     "${GLSLANG_PREFIX}/glslang/Include"
     "${GLSLANG_PREFIX}/glslang/Public"
     "${GLSLANG_PREFIX}/BIL"
-    "/usr/include/ImageMagick"
+    ${ImageMagick_INCLUDE_DIRS}
     )
 
+add_definitions(
+    -DMAGICKCORE_QUANTUM_DEPTH=16
+    -DMAGICKCORE_HDRI_ENABLE=0
+    )
 
 add_executable(xglbase init.cpp ${COMMON_CPP})
 set_target_properties(xglbase

tests/xgltestframework.cpp

diff --git a/tests/xgltestframework.cpp b/tests/xgltestframework.cpp
index ddaee19..54259c4 100644
--- a/tests/xgltestframework.cpp
+++ b/tests/xgltestframework.cpp
@@ -25,7 +25,7 @@
 //#include "ShaderLang.h"
 #include "GlslangToBil.h"
 #include <math.h>
-#include <ImageMagick/wand/MagickWand.h>
+#include <wand/MagickWand.h>
 
 // Command-line options
 enum TOptions {