From 6e64fe28600be374c09f456d6b0076a5fc02f02c Mon Sep 17 00:00:00 2001
From: su_v <suv-sf@users.sourceforge.net>
Date: Wed, 2 Sep 2015 19:25:24 +0200
Subject: cmake: make JPEG optional; fix using it (if found)

(bzr r14341)
---
 CMakeScripts/DefineDependsandFlags.cmake | 13 ++++++-------
 config.h.cmake                           |  3 +++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 8d6405265..e6089daa4 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -181,13 +181,12 @@ if(WITH_LIBCDR)
 	endif()
 endif()
 
-FIND_PACKAGE(JPEG REQUIRED)
-#IF(JPEG_FOUND)
-  #INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
-  #TARGET_LINK_LIBRARIES(mpo ${JPEG_LIBRARIES})
-#ENDIF()
-list(APPEND INKSCAPE_INCS_SYS ${JPEG_INCLUDE_DIR})
-list(APPEND INKSCAPE_LIBS ${JPEG_LIBRARIES})
+FIND_PACKAGE(JPEG)
+IF(JPEG_FOUND)
+	list(APPEND INKSCAPE_INCS_SYS ${JPEG_INCLUDE_DIR})
+	list(APPEND INKSCAPE_LIBS ${JPEG_LIBRARIES})
+	set(HAVE_JPEG ON)
+ENDIF()
 
 find_package(PNG REQUIRED)
 list(APPEND INKSCAPE_INCS_SYS ${PNG_PNG_INCLUDE_DIR})
diff --git a/config.h.cmake b/config.h.cmake
index c793f59b6..cd1d4eb5c 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -289,6 +289,9 @@
 /* Image Magick++ support for bitmap effects */
 #cmakedefine WITH_IMAGE_MAGICK 1
 
+/* Use libjpeg */
+#cmakedefine HAVE_JPEG 1
+
 /* Build in Inkboard support */
 #cmakedefine WITH_INKBOARD 1
 
-- 
cgit v1.2.3