Merge pull request #17 from favreau/master

Fixed ImageMagick dependency
BlueBrain · Jul 26, 2016 · 1e51cd1 · 1e51cd1
2 parents b33f8d1 + eb5b280
commit 1e51cd1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,7 +38,7 @@ common_find_package(vmmlib REQUIRED)
 
 option(BRAYNS_IMAGEMAGICK_ENABLED "Activate IMAGEMAGICK library for standard image file format management" ON)
 if(BRAYNS_IMAGEMAGICK_ENABLED)
-  common_find_package(Magick++)
+  common_find_package(Magick++ SYSTEM)
 endif()
 
 option(BRAYNS_ASSIMP_ENABLED "Activate assimp library for standard 3D file format management" ON)

diff --git a/brayns/io/CMakeLists.txt b/brayns/io/CMakeLists.txt
@@ -30,4 +30,8 @@ if(TARGET Brion)
   list(APPEND BRAYNSIO_LINK_LIBRARIES Brion Brain)
 endif()
 
+if(MAGICK++_FOUND)
+  list(APPEND BRAYNSIO_LINK_LIBRARIES ${Magick++_LIBRARIES})
+endif()
+
 common_library(braynsIO)
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -38,10 +38,6 @@ if(TARGET Lexis AND TARGET ZeroEQ)
   add_subdirectory(extensions/vocabulary)
 endif()
 
-if(MAGICK++_FOUND)
-  list(APPEND BRAYNSPLUGINS_LINK_LIBRARIES Magick++)
-endif()
-
 if(OSPRAY_FOUND)
   add_subdirectory(engines/ospray)
   list(APPEND BRAYNSPLUGINS_LINK_LIBRARIES PUBLIC braynsOSPRayPlugin)