From 5557c73f06d4c2b3640a93cb3dd2d0eba72ed2ca Mon Sep 17 00:00:00 2001
From: Bryce Harrington <bryce@bryceharrington.org>
Date: Wed, 29 Apr 2015 02:32:07 -0400
Subject: cmake: Don't depend on OpenSSL

I'm not sure why this was in the cmake rules but it doesn't seem to be
required for plain vanilla Inkscape builds.

(bzr r14070.1.2)
---
 CMakeScripts/DefineDependsandFlags.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'CMakeScripts')

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 12f0b5240..ffeab5808 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -227,9 +227,9 @@ if(WITH_GTKSPELL)
 	set(WITH_GTKSPELL ${GTKSPELL_FOUND})
 endif()
 
-find_package(OpenSSL)
-list(APPEND INKSCAPE_INCS_SYS ${OPENSSL_INCLUDE_DIR})
-list(APPEND INKSCAPE_LIBS ${OPENSSL_LIBRARIES})
+#find_package(OpenSSL)
+#list(APPEND INKSCAPE_INCS_SYS ${OPENSSL_INCLUDE_DIR})
+#list(APPEND INKSCAPE_LIBS ${OPENSSL_LIBRARIES})
 
 find_package(LibXslt REQUIRED)
 list(APPEND INKSCAPE_INCS_SYS ${LIBXSLT_INCLUDE_DIR})
-- 
cgit v1.2.3


From 7969df944138a5524d40be8e9030b90629f6ec18 Mon Sep 17 00:00:00 2001
From: Bryce Harrington <bryce@bryceharrington.org>
Date: Wed, 29 Apr 2015 19:25:17 -0400
Subject: cmake: Add missing dependencies for libgomp and libjpg

(bzr r14070.1.5)
---
 CMakeScripts/DefineDependsandFlags.cmake | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'CMakeScripts')

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index ffeab5808..637e48d6a 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -3,8 +3,7 @@ set(INKSCAPE_LIBS "")
 set(INKSCAPE_INCS "")
 set(INKSCAPE_INCS_SYS "")
 
-list(APPEND INKSCAPE_INCS
-	${PROJECT_SOURCE_DIR}
+list(APPEND INKSCAPE_INCS ${PROJECT_SOURCE_DIR}
 	${PROJECT_SOURCE_DIR}/src
 
 	# generated includes
@@ -33,6 +32,7 @@ else()
 	list(APPEND INKSCAPE_LIBS "-lX11")  # FIXME
 endif()
 
+list(APPEND INKSCAPE_LIBS "-lgomp")  # FIXME
 list(APPEND INKSCAPE_LIBS "-lgslcblas")  # FIXME
 
 if(WITH_GNOME_VFS)
@@ -127,6 +127,14 @@ if(WITH_LIBWPG)
 	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(PNG REQUIRED)
 list(APPEND INKSCAPE_INCS_SYS ${PNG_PNG_INCLUDE_DIR})
 list(APPEND INKSCAPE_LIBS ${PNG_LIBRARY})
-- 
cgit v1.2.3