cmake: refactor SRC lists for optional input formats (cdr, vsd, wpg)

(bzr r14139)

1 files changed, 15 insertions, 7 deletions

diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt
index d1104f3cc..21e652563 100644
--- a/src/extension/CMakeLists.txt
+++ b/src/extension/CMakeLists.txt
@@ -36,7 +36,6 @@ set(extension_SRC
 	internal/cairo-render-context.cpp
 	internal/cairo-renderer.cpp
 	internal/cairo-renderer-pdf-out.cpp
-	internal/cdr-input.cpp
 	internal/emf-inout.cpp
 	internal/emf-print.cpp
 	internal/gdkpixbuf-input.cpp
@@ -54,10 +53,8 @@ set(extension_SRC
 	internal/svg.cpp
 	internal/svgz.cpp
 	internal/text_reassemble.c
-	internal/vsd-input.cpp
 	internal/wmf-inout.cpp
 	internal/wmf-print.cpp
-	internal/wpg-input.cpp
 
 	internal/filter/filter-all.cpp
 	internal/filter/filter-file.cpp
@@ -104,7 +101,6 @@ set(extension_SRC
 	internal/cairo-render-context.h
 	internal/cairo-renderer-pdf-out.h
 	internal/cairo-renderer.h
-	internal/cdr-input.h
 	internal/clear-n_.h
 	internal/emf-inout.h
 	internal/emf-print.h
@@ -140,10 +136,8 @@ set(extension_SRC
 	internal/svg.h
 	internal/svgz.h
 	internal/text_reassemble.h
-	internal/vsd-input.h
 	internal/wmf-inout.h
 	internal/wmf-print.h
-	internal/wpg-input.h
 )
 
 if(WIN32)
@@ -151,6 +145,20 @@ if(WIN32)
 	)
 endif()
 
+if(WITH_LIBCDR)
+	list(APPEND extension_SRC
+		internal/cdr-input.cpp
+		internal/cdr-input.h
+	)
+endif()
+
+if(WITH_LIBVISIO)
+	list(APPEND extension_SRC
+		internal/vsd-input.cpp
+		internal/vsd-input.h
+	)
+endif()
+
 if(WITH_LIBWPG)
 	list(APPEND extension_SRC
 		internal/wpg-input.cpp
@@ -158,7 +166,7 @@ if(WITH_LIBWPG)
 	)
 endif()
 
-if(ImageMagick_FOUND)
+if(WITH_IMAGE_MAGICK)
 	list(APPEND extension_SRC
 		internal/bitmap/adaptiveThreshold.cpp
 		internal/bitmap/adaptiveThreshold.h