Cmake: add missing file

(bzr r7090)

2 files changed, 145 insertions, 56 deletions

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 8d23ce08f..19cb012de 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -1,63 +1,63 @@
 

-# Include dependencies:
-find_package(GTK2 REQUIRED)
-find_package(GtkMM REQUIRED)
-find_package(SigC++ REQUIRED)
-find_package(XML2 REQUIRED)
-find_package(XSLT REQUIRED)
-find_package(GSL REQUIRED)
-find_package(ImageMagick++ REQUIRED)
-find_package(Freetype2 REQUIRED)
+# Include dependencies:

+find_package(GTK2 REQUIRED)

+find_package(GtkMM REQUIRED)

+find_package(SigC++ REQUIRED)

+find_package(XML2 REQUIRED)

+find_package(XSLT REQUIRED)

+find_package(GSL REQUIRED)

+find_package(ImageMagick++ REQUIRED)

+find_package(Freetype2 REQUIRED)

 find_package(GnomeVFS2)

 find_package(Boost REQUIRED)

-find_package(BoehmGC REQUIRED)
-find_package(LibWPG)
-find_package(PNG REQUIRED) 
-find_package(Popt REQUIRED)
+find_package(BoehmGC REQUIRED)

+find_package(LibWPG)

+find_package(PNG REQUIRED) 

+find_package(Popt REQUIRED)

 find_package(OpenSSL)

 INCLUDE(IncludeJava)

-# end Dependencies
-
+# end Dependencies

+

 #Linking 

-LIST(APPEND INKSCAPE_LIBS 
-${GTK2_LIBRARIES}
-${GTKMM_LIBRARIES}
-${SIGC++_LIBRARIES}
-${GSL_LIBRARIES}
-${XML2_LIBRARIES}
-${XSLT_LIBRARIES}
-${IMAGEMAGICK++_LIBRARIES}
-${FREETYPE2_LIBRARIES}
-${GNOMEVFS2_LIBRARIES}
-${BOOST_LIBRARIES}
-${BOEHMGC_LIBRARIES}
-${PNG_LIBRARIES}
-${POPT_LIBRARIES}
-${OPENSSL_LIBRARIES}
-)
-
-#Includes 
-SET(INK_INCLUDES
-${CMAKE_BINARY_DIR}
-${PROJECT_SOURCE_DIR}
-${PROJECT_SOURCE_DIR}/src
-${GTK2_INCLUDE_DIRS}
-${GTKMM_INCLUDE_DIRS}
-${SIGC++_INCLUDE_DIRS}
-${GSL_INCLUDE_DIRS}
-${XML2_INCLUDE_DIRS}
-${XSLT_INCLUDE_DIRS}
-${IMAGEMAGICK++_INCLUDE_DIRS}
-${FREETYPE2_INCLUDE_DIRS}
-${GNOMEVFS2_INCLUDE_DIRS}
-${BOOST_INCLUDE_DIRS}
-${BOEHMGC_INCLUDE_DIRS}
-${PNG_INCLUDE_DIRS}
-${POPT_INCLUDE_DIRS}
-${OPENSSL_INCLUDE_DIRS}
-)
-#C/C++ Flags
-INCLUDE_DIRECTORIES(${INK_INCLUDES})
-
+LIST(APPEND INKSCAPE_LIBS 

+${GTK2_LIBRARIES}

+${GTKMM_LIBRARIES}

+${SIGC++_LIBRARIES}

+${GSL_LIBRARIES}

+${XML2_LIBRARIES}

+${XSLT_LIBRARIES}

+${IMAGEMAGICK++_LIBRARIES}

+${FREETYPE2_LIBRARIES}

+${GNOMEVFS2_LIBRARIES}

+${BOOST_LIBRARIES}

+${BOEHMGC_LIBRARIES}

+${PNG_LIBRARIES}

+${POPT_LIBRARIES}

+${OPENSSL_LIBRARIES}

+)

+

+#Includes 

+SET(INK_INCLUDES

+${CMAKE_BINARY_DIR}

+${PROJECT_SOURCE_DIR}

+${PROJECT_SOURCE_DIR}/src

+${GTK2_INCLUDE_DIRS}

+${GTKMM_INCLUDE_DIRS}

+${SIGC++_INCLUDE_DIRS}

+${GSL_INCLUDE_DIRS}

+${XML2_INCLUDE_DIRS}

+${XSLT_INCLUDE_DIRS}

+${IMAGEMAGICK++_INCLUDE_DIRS}

+${FREETYPE2_INCLUDE_DIRS}

+${GNOMEVFS2_INCLUDE_DIRS}

+${BOOST_INCLUDE_DIRS}

+${BOEHMGC_INCLUDE_DIRS}

+${PNG_INCLUDE_DIRS}

+${POPT_INCLUDE_DIRS}

+${OPENSSL_INCLUDE_DIRS}

+)

+#C/C++ Flags

+INCLUDE_DIRECTORIES(${INK_INCLUDES})

+

 #INCLUDE(ConfigCompileFlags)

-INCLUDE(ConfigChecks)
+INCLUDE(ConfigChecks)

diff --git a/CMakeScripts/FindSSL.cmake b/CMakeScripts/FindSSL.cmake
new file mode 100644
index 000000000..7a2671699
--- /dev/null
+++ b/CMakeScripts/FindSSL.cmake
@@ -0,0 +1,89 @@
+# - Try to find SSL
+# Once done this will define
+#
+#  SSL_FOUND - system has SSL
+#  SSL_INCLUDE_DIRS - the SSL include directory
+#  SSL_LIBRARIES - Link these to use SSL
+#  SSL_DEFINITIONS - Compiler switches required for using SSL
+#
+#  Copyright (c) 2008 Joshua L. Blocher <verbalshadow@gmail.com>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+if (SSL_LIBRARIES AND SSL_INCLUDE_DIRS)
+  # in cache already
+  set(SSL_FOUND TRUE)
+else (SSL_LIBRARIES AND SSL_INCLUDE_DIRS)
+  # use pkg-config to get the directories and then use these values
+  # in the FIND_PATH() and FIND_LIBRARY() calls
+  if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+    include(UsePkgConfig)
+    pkgconfig(libssl _SSL_INCLUDEDIR _SSL_LIBDIR _SSL_LDFLAGS _SSL_CFLAGS)
+  else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+    find_package(PkgConfig)
+    if (PKG_CONFIG_FOUND)
+      pkg_check_modules(_SSL libssl)
+    endif (PKG_CONFIG_FOUND)
+  endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+  find_path(SSL_INCLUDE_DIR
+    NAMES
+      ssl.h
+    PATHS
+      ${_SSL_INCLUDEDIR}
+      /usr/include
+      /usr/local/include
+      /opt/local/include
+      /sw/include
+    PATH_SUFFIXES
+      openssl
+  )
+
+  find_library(SSL_LIBRARY
+    NAMES
+      ssl
+    PATHS
+      ${_SSL_LIBDIR}
+      /usr/lib
+      /usr/local/lib
+      /opt/local/lib
+      /sw/lib
+  )
+
+  if (SSL_LIBRARY)
+    set(SSL_FOUND TRUE)
+  endif (SSL_LIBRARY)
+
+  set(SSL_INCLUDE_DIRS
+    ${SSL_INCLUDE_DIR}
+  )
+
+  if (SSL_FOUND)
+    set(SSL_LIBRARIES
+      ${SSL_LIBRARIES}
+      ${SSL_LIBRARY}
+    )
+  endif (SSL_FOUND)
+
+  if (SSL_INCLUDE_DIRS AND SSL_LIBRARIES)
+     set(SSL_FOUND TRUE)
+  endif (SSL_INCLUDE_DIRS AND SSL_LIBRARIES)
+
+  if (SSL_FOUND)
+    if (NOT SSL_FIND_QUIETLY)
+      message(STATUS "Found SSL: ${SSL_LIBRARIES}")
+    endif (NOT SSL_FIND_QUIETLY)
+  else (SSL_FOUND)
+    if (SSL_FIND_REQUIRED)
+      message(FATAL_ERROR "Could not find SSL")
+    endif (SSL_FIND_REQUIRED)
+  endif (SSL_FOUND)
+
+  # show the SSL_INCLUDE_DIRS and SSL_LIBRARIES variables only in the advanced view
+  mark_as_advanced(SSL_INCLUDE_DIRS SSL_LIBRARIES)
+
+endif (SSL_LIBRARIES AND SSL_INCLUDE_DIRS)
+